fjbender / magento-1

lib/Payone/Log4php/LoggerLayout.php

Indentation +41 added lines, -41 removed lines

@@ -25,50 +25,50 @@
  * @package log4php
  */
 abstract class Payone_Log4php_LoggerLayout extends Payone_Log4php_LoggerConfigurable {
-	/**
-	 * 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(Payone_Log4php_LoggerLoggingEvent $event) {
-		return $event->getRenderedMessage();
-	} 
+    /**
+     * Override this method to create your own layout format.
+     *
+     * @param LoggerLoggingEvent
+     * @return string
+     */
+    public function format(Payone_Log4php_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;
+    }
 	
-	/** Triggers a warning for this layout with the given message. */
-	protected function warn($message) {
-		trigger_error("log4php: [" . get_class($this) . "]: $message", E_USER_WARNING);
-	}
+    /** Triggers a warning for this layout with the given message. */
+    protected function warn($message) {
+        trigger_error("log4php: [" . get_class($this) . "]: $message", E_USER_WARNING);
+    }
 }

lib/Payone/Log4php/LoggerLayoutTTCC.php

Indentation +121 added lines, -121 removed lines

@@ -50,148 +50,148 @@
  */
 class Payone_Log4php_LoggerLayoutTTCC extends Payone_Log4php_LoggerLayout {
 
-	// Internal representation of options
-	protected $threadPrinting    = true;
-	protected $categoryPrefixing = true;
-	protected $contextPrinting   = true;
-	protected $microSecondsPrinting = true;
+    // Internal representation of options
+    protected $threadPrinting    = true;
+    protected $categoryPrefixing = true;
+    protected $contextPrinting   = true;
+    protected $microSecondsPrinting = true;
 	
-	/**
-	 * @var string date format. See {@link PHP_MANUAL#strftime} for details
-	 */
-	protected $dateFormat = '%c';
+    /**
+     * @var string date format. See {@link PHP_MANUAL#strftime} for details
+     */
+    protected $dateFormat = '%c';
 
-	/**
-	 * Constructor
-	 *
-	 * @param string date format
-	 * @see dateFormat
-	 */
-	public function __construct($dateFormat = '') {
-		if (!empty($dateFormat)) {
-			$this->dateFormat = $dateFormat;
-		}
-		return;
-	}
+    /**
+     * Constructor
+     *
+     * @param string date format
+     * @see dateFormat
+     */
+    public function __construct($dateFormat = '') {
+        if (!empty($dateFormat)) {
+            $this->dateFormat = $dateFormat;
+        }
+        return;
+    }
 
-	/**
-	 * The <b>ThreadPrinting</b> option specifies whether the name of the
-	 * current thread is part of log output or not. This is true by default.
-	 */
-	public function setThreadPrinting($threadPrinting) {
-		$this->setBoolean('threadPrinting', $threadPrinting);
-	}
+    /**
+     * The <b>ThreadPrinting</b> option specifies whether the name of the
+     * current thread is part of log output or not. This is true by default.
+     */
+    public function setThreadPrinting($threadPrinting) {
+        $this->setBoolean('threadPrinting', $threadPrinting);
+    }
 
-	/**
-	 * @return boolean Returns value of the <b>ThreadPrinting</b> option.
-	 */
-	public function getThreadPrinting() {
-		return $this->threadPrinting;
-	}
+    /**
+     * @return boolean Returns value of the <b>ThreadPrinting</b> option.
+     */
+    public function getThreadPrinting() {
+        return $this->threadPrinting;
+    }
 
-	/**
-	 * The <b>CategoryPrefixing</b> option specifies whether {@link Category}
-	 * name is part of log output or not. This is true by default.
-	 */
-	public function setCategoryPrefixing($categoryPrefixing) {
-		$this->setBoolean('categoryPrefixing', $categoryPrefixing);
-	}
+    /**
+     * The <b>CategoryPrefixing</b> option specifies whether {@link Category}
+     * name is part of log output or not. This is true by default.
+     */
+    public function setCategoryPrefixing($categoryPrefixing) {
+        $this->setBoolean('categoryPrefixing', $categoryPrefixing);
+    }
 
-	/**
-	 * @return boolean Returns value of the <b>CategoryPrefixing</b> option.
-	 */
-	public function getCategoryPrefixing() {
-		return $this->categoryPrefixing;
-	}
+    /**
+     * @return boolean Returns value of the <b>CategoryPrefixing</b> option.
+     */
+    public function getCategoryPrefixing() {
+        return $this->categoryPrefixing;
+    }
 
-	/**
-	 * The <b>ContextPrinting</b> option specifies log output will include
-	 * the nested context information belonging to the current thread.
-	 * This is true by default.
-	 */
-	public function setContextPrinting($contextPrinting) {
-		$this->setBoolean('contextPrinting', $contextPrinting);
-	}
+    /**
+     * The <b>ContextPrinting</b> option specifies log output will include
+     * the nested context information belonging to the current thread.
+     * This is true by default.
+     */
+    public function setContextPrinting($contextPrinting) {
+        $this->setBoolean('contextPrinting', $contextPrinting);
+    }
 
-	/**
-	 * @return boolean Returns value of the <b>ContextPrinting</b> option.
-	 */
-	public function getContextPrinting() {
-		return $this->contextPrinting;
-	}
+    /**
+     * @return boolean Returns value of the <b>ContextPrinting</b> option.
+     */
+    public function getContextPrinting() {
+        return $this->contextPrinting;
+    }
 	
-	/**
-	 * The <b>MicroSecondsPrinting</b> option specifies if microseconds infos
-	 * should be printed at the end of timestamp.
-	 * This is true by default.
-	 */
-	public function setMicroSecondsPrinting($microSecondsPrinting) {
-		$this->setBoolean('microSecondsPrinting', $microSecondsPrinting);
-	}
+    /**
+     * The <b>MicroSecondsPrinting</b> option specifies if microseconds infos
+     * should be printed at the end of timestamp.
+     * This is true by default.
+     */
+    public function setMicroSecondsPrinting($microSecondsPrinting) {
+        $this->setBoolean('microSecondsPrinting', $microSecondsPrinting);
+    }
 
-	/**
-	 * @return boolean Returns value of the <b>MicroSecondsPrinting</b> option.
-	 */
-	public function getMicroSecondsPrinting() {
-		return $this->microSecondsPrinting;
-	}
+    /**
+     * @return boolean Returns value of the <b>MicroSecondsPrinting</b> option.
+     */
+    public function getMicroSecondsPrinting() {
+        return $this->microSecondsPrinting;
+    }
 	
 	
-	public function setDateFormat($dateFormat) {
-		$this->setString('dateFormat', $dateFormat);
-	}
+    public function setDateFormat($dateFormat) {
+        $this->setString('dateFormat', $dateFormat);
+    }
 	
-	/**
-	 * @return string
-	 */
-	public function getDateFormat() {
-		return $this->dateFormat;
-	}
+    /**
+     * @return string
+     */
+    public function getDateFormat() {
+        return $this->dateFormat;
+    }
 
-	/**
-	 * In addition to the level of the statement and message, the
-	 * returned string includes time, thread, category.
-	 * <p>Time, thread, category are printed depending on options.
-	 *
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function format(Payone_Log4php_LoggerLoggingEvent $event) {
-		$timeStamp = (float)$event->getTimeStamp();
-		$format = strftime($this->dateFormat, (int)$timeStamp);
+    /**
+     * In addition to the level of the statement and message, the
+     * returned string includes time, thread, category.
+     * <p>Time, thread, category are printed depending on options.
+     *
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     * @return string
+     */
+    public function format(Payone_Log4php_LoggerLoggingEvent $event) {
+        $timeStamp = (float)$event->getTimeStamp();
+        $format = strftime($this->dateFormat, (int)$timeStamp);
 		
-		if ($this->microSecondsPrinting) {
-			$usecs = floor(($timeStamp - (int)$timeStamp) * 1000);
-			$format .= sprintf(',%03d', $usecs);
-		}
+        if ($this->microSecondsPrinting) {
+            $usecs = floor(($timeStamp - (int)$timeStamp) * 1000);
+            $format .= sprintf(',%03d', $usecs);
+        }
 			
-		$format .= ' ';
+        $format .= ' ';
 		
-		if ($this->threadPrinting) {
-			$format .= '['.getmypid().'] ';
-		}
+        if ($this->threadPrinting) {
+            $format .= '['.getmypid().'] ';
+        }
 		
-		$level = $event->getLevel();
-		$format .= $level.' ';
+        $level = $event->getLevel();
+        $format .= $level.' ';
 		
-		if($this->categoryPrefixing) {
-			$format .= $event->getLoggerName().' ';
-		}
+        if($this->categoryPrefixing) {
+            $format .= $event->getLoggerName().' ';
+        }
 	   
-		if($this->contextPrinting) {
-			$ndc = $event->getNDC();
-			if($ndc != null) {
-				$format .= $ndc.' ';
-			}
-		}
+        if($this->contextPrinting) {
+            $ndc = $event->getNDC();
+            if($ndc != null) {
+                $format .= $ndc.' ';
+            }
+        }
 		
-		$format .= '- '.$event->getRenderedMessage();
-		$format .= PHP_EOL;
+        $format .= '- '.$event->getRenderedMessage();
+        $format .= PHP_EOL;
 		
-		return $format;
-	}
+        return $format;
+    }
 
-	public function ignoresThrowable() {
-		return true;
-	}
+    public function ignoresThrowable() {
+        return true;
+    }
 }

lib/Payone/Log4php/LoggerAppenderMail.php

Indentation +45 added lines, -46 removed lines

@@ -47,67 +47,66 @@
  *      Tue Sep  8 21:51:04 2009,120 [5485] FATAL root - Some critical message!
  *      Tue Sep  8 21:51:06 2009,120 [5485] FATAL root - Some more critical message!
  * </pre>
-
  * @version $Revision$
  * @package log4php
  * @subpackage appenders
  */
 class Payone_Log4php_LoggerAppenderMail extends Payone_Log4php_LoggerAppender {
 
-	/** @var string 'from' field */
-	protected $from = null;
+    /** @var string 'from' field */
+    protected $from = null;
 
-	/** @var string 'subject' field */
-	protected $subject = 'Log4php Report';
+    /** @var string 'subject' field */
+    protected $subject = 'Log4php Report';
 	
-	/** @var string 'to' field */
-	protected $to = null;
+    /** @var string 'to' field */
+    protected $to = null;
 
-	/** @var indiciates if this appender should run in dry mode */
-	protected $dry = false;
+    /** @var indiciates if this appender should run in dry mode */
+    protected $dry = false;
 
-	/** @var string used to create mail body */
-	protected $body = '';
+    /** @var string used to create mail body */
+    protected $body = '';
 	
-	public function close() {
-		if($this->closed != true) {
-			$from = $this->from;
-			$to = $this->to;
+    public function close() {
+        if($this->closed != true) {
+            $from = $this->from;
+            $to = $this->to;
 	
-			if(!empty($this->body) and $from !== null and $to !== null and $this->layout !== null) {
-				$subject = $this->subject;
-				if(!$this->dry) {
-					mail(
-						$to, $subject, 
-						$this->layout->getHeader() . $this->body . $this->layout->getFooter(),
-						"From: {$from}\r\n");
-				} else {
-				    echo "DRY MODE OF MAIL APP.: Send mail to: ".$to." with content: ".$this->body;
-				}
-			}
-			$this->closed = true;
-		}
-	}
+            if(!empty($this->body) and $from !== null and $to !== null and $this->layout !== null) {
+                $subject = $this->subject;
+                if(!$this->dry) {
+                    mail(
+                        $to, $subject, 
+                        $this->layout->getHeader() . $this->body . $this->layout->getFooter(),
+                        "From: {$from}\r\n");
+                } else {
+                    echo "DRY MODE OF MAIL APP.: Send mail to: ".$to." with content: ".$this->body;
+                }
+            }
+            $this->closed = true;
+        }
+    }
 	
-	public function setSubject($subject) {
-		$this->setString('subject', $subject);
-	}
+    public function setSubject($subject) {
+        $this->setString('subject', $subject);
+    }
 	
-	public function setTo($to) {
-		$this->setString('to', $to);
-	}
+    public function setTo($to) {
+        $this->setString('to', $to);
+    }
 
-	public function setFrom($from) {
-		$this->setString('from', $from);
-	}
+    public function setFrom($from) {
+        $this->setString('from', $from);
+    }
 
-	public function setDry($dry) {
-		$this->setBoolean('dry', $dry);
-	}
+    public function setDry($dry) {
+        $this->setBoolean('dry', $dry);
+    }
 	
-	public function append(Payone_Log4php_LoggerLoggingEvent $event) {
-		if($this->layout !== null) {
-			$this->body .= $this->layout->format($event);
-		}
-	}
+    public function append(Payone_Log4php_LoggerLoggingEvent $event) {
+        if($this->layout !== null) {
+            $this->body .= $this->layout->format($event);
+        }
+    }
 }

lib/Payone/Log4php/LoggerAppenderSocket.php

Indentation +82 added lines, -82 removed lines

@@ -36,87 +36,87 @@
  */ 
 class Payone_Log4php_LoggerAppenderSocket extends Payone_Log4php_LoggerAppender {
 	
-	/** 
-	 * Target host.
-	 * @see http://php.net/manual/en/function.fsockopen.php 
-	 */
-	protected $remoteHost;
-	
-	/** Target port */
-	protected $port = 4446;
-	
-	/** Connection timeout in ms. */
-	protected $timeout;
-	
-	// ******************************************
-	// *** Appender methods                   ***
-	// ******************************************
-	
-	/** Override the default layout to use serialized. */
-	public function getDefaultLayout() {
-		return new Payone_Log4php_LoggerLayoutSerialized();
-	}
-	
-	public function activateOptions() {
-		if (empty($this->remoteHost)) {
-			$this->warn("Required parameter [remoteHost] not set. Closing appender.");
-			$this->closed = true;
-			return;
-		}
-	
-		if (empty($this->timeout)) {
-			$this->timeout = ini_get("default_socket_timeout");
-		}
-	
-		$this->closed = false;
-	}
-	
-	public function append(Payone_Log4php_LoggerLoggingEvent $event) {
-		$socket = fsockopen($this->remoteHost, $this->port, $errno, $errstr, $this->timeout);
-		if ($socket === false) {
-			$this->warn("Could not open socket to {$this->remoteHost}:{$this->port}. Closing appender.");
-			$this->closed = true;
-			return;
-		}
-	
-		if (false === fwrite($socket, $this->layout->format($event))) {
-			$this->warn("Error writing to socket. Closing appender.");
-			$this->closed = true;
-		}
-		fclose($socket);
-	}
-	
-	// ******************************************
-	// *** Accessor methods                   ***
-	// ******************************************
-	
-	/** Sets the target host. */
-	public function setRemoteHost($hostname) {
-		$this->setString('remoteHost', $hostname);
-	}
-	
-	/** Sets the target port */
-	public function setPort($port) {
-		$this->setPositiveInteger('port', $port);
-	}
+    /** 
+     * Target host.
+     * @see http://php.net/manual/en/function.fsockopen.php 
+     */
+    protected $remoteHost;
+	
+    /** Target port */
+    protected $port = 4446;
+	
+    /** Connection timeout in ms. */
+    protected $timeout;
+	
+    // ******************************************
+    // *** Appender methods                   ***
+    // ******************************************
+	
+    /** Override the default layout to use serialized. */
+    public function getDefaultLayout() {
+        return new Payone_Log4php_LoggerLayoutSerialized();
+    }
+	
+    public function activateOptions() {
+        if (empty($this->remoteHost)) {
+            $this->warn("Required parameter [remoteHost] not set. Closing appender.");
+            $this->closed = true;
+            return;
+        }
+	
+        if (empty($this->timeout)) {
+            $this->timeout = ini_get("default_socket_timeout");
+        }
+	
+        $this->closed = false;
+    }
+	
+    public function append(Payone_Log4php_LoggerLoggingEvent $event) {
+        $socket = fsockopen($this->remoteHost, $this->port, $errno, $errstr, $this->timeout);
+        if ($socket === false) {
+            $this->warn("Could not open socket to {$this->remoteHost}:{$this->port}. Closing appender.");
+            $this->closed = true;
+            return;
+        }
+	
+        if (false === fwrite($socket, $this->layout->format($event))) {
+            $this->warn("Error writing to socket. Closing appender.");
+            $this->closed = true;
+        }
+        fclose($socket);
+    }
+	
+    // ******************************************
+    // *** Accessor methods                   ***
+    // ******************************************
+	
+    /** Sets the target host. */
+    public function setRemoteHost($hostname) {
+        $this->setString('remoteHost', $hostname);
+    }
+	
+    /** Sets the target port */
+    public function setPort($port) {
+        $this->setPositiveInteger('port', $port);
+    }
 	 
-	/** Sets the timeout. */
-	public function setTimeout($timeout) {
-		$this->setPositiveInteger('timeout', $timeout);
-	}
-	
-	/** Returns the target host. */
-	public function getRemoteHost() {
-		return $this->getRemoteHost();
-	}
-	
-	/** Returns the target port. */
-	public function getPort() {
-		return $this->port;
-	}
-	
-	/** Returns the timeout */
-	public function getTimeout() {
-		return $this->timeout;
-	}
+    /** Sets the timeout. */
+    public function setTimeout($timeout) {
+        $this->setPositiveInteger('timeout', $timeout);
+    }
+	
+    /** Returns the target host. */
+    public function getRemoteHost() {
+        return $this->getRemoteHost();
+    }
+	
+    /** Returns the target port. */
+    public function getPort() {
+        return $this->port;
+    }
+	
+    /** Returns the timeout */
+    public function getTimeout() {
+        return $this->timeout;
+    }
 }

lib/Payone/Log4php/LoggerConfiguratorDefault.php

Indentation +382 added lines, -382 removed lines

@@ -30,24 +30,24 @@ 
  */
 class Payone_Log4php_LoggerConfiguratorDefault implements Payone_Log4php_LoggerConfigurator
 {
-	/** XML configuration file format. */
-	const FORMAT_XML = 'xml';
+    /** XML configuration file format. */
+    const FORMAT_XML = 'xml';
 	
-	/** PHP configuration file format. */
-	const FORMAT_PHP = 'php';
+    /** PHP configuration file format. */
+    const FORMAT_PHP = 'php';
 	
-	/** INI (properties) configuration file format. */
-	const FORMAT_INI = 'ini';
+    /** INI (properties) configuration file format. */
+    const FORMAT_INI = 'ini';
 
-	/** Defines which adapter should be used for parsing which format. */
-	private $adapters = array(
-		self::FORMAT_XML => 'Payone_Log4php_LoggerConfigurationAdapterXML',
-		self::FORMAT_INI => 'Payone_Log4php_LoggerConfigurationAdapterINI',
-		self::FORMAT_PHP => 'Payone_Log4php_LoggerConfigurationAdapterPHP',
-	);
+    /** Defines which adapter should be used for parsing which format. */
+    private $adapters = array(
+        self::FORMAT_XML => 'Payone_Log4php_LoggerConfigurationAdapterXML',
+        self::FORMAT_INI => 'Payone_Log4php_LoggerConfigurationAdapterINI',
+        self::FORMAT_PHP => 'Payone_Log4php_LoggerConfigurationAdapterPHP',
+    );
 	
-	/** Default configuration; used if no configuration file is provided. */
-	private static $defaultConfiguration = array(
+    /** Default configuration; used if no configuration file is provided. */
+    private static $defaultConfiguration = array(
         'threshold' => 'ALL',
         'rootLogger' => array(
             'level' => 'DEBUG',
@@ -61,425 +61,425 @@ 
                 ),
             ),
         ),
-	);
+    );
 	
-	/** Holds the appenders before they are linked to loggers. */
-	private $appenders = array();
+    /** Holds the appenders before they are linked to loggers. */
+    private $appenders = array();
 	
-	/**
-	 * Configures log4php based on the given configuration. The input can 
-	 * either be a path to the config file, or a PHP array holding the 
-	 * configuration. 
-	 * 
-	 * If no configuration is given, or if the given configuration cannot be
-	 * parsed for whatever reason, a warning will be issued, and log4php
-	 * will use the default configuration contained in 
-	 * {@link $defaultConfiguration}.
-	 * 
-	 * @param Payone_Log4php_LoggerHierarchy $hierarchy The hierarchy on which to perform
-	 * 		the configuration. 
-	 * @param string|array $input Either path to the config file or the 
-	 * 		configuration as an array. If not set, default configuration 
-	 * 		will be used.
-	 */
-	public function configure(Payone_Log4php_LoggerHierarchy $hierarchy, $input = null) {
-		$config = $this->parse($input);
-		$this->doConfigure($hierarchy, $config);
-	}
+    /**
+     * Configures log4php based on the given configuration. The input can 
+     * either be a path to the config file, or a PHP array holding the 
+     * configuration. 
+     * 
+     * If no configuration is given, or if the given configuration cannot be
+     * parsed for whatever reason, a warning will be issued, and log4php
+     * will use the default configuration contained in 
+     * {@link $defaultConfiguration}.
+     * 
+     * @param Payone_Log4php_LoggerHierarchy $hierarchy The hierarchy on which to perform
+     * 		the configuration. 
+     * @param string|array $input Either path to the config file or the 
+     * 		configuration as an array. If not set, default configuration 
+     * 		will be used.
+     */
+    public function configure(Payone_Log4php_LoggerHierarchy $hierarchy, $input = null) {
+        $config = $this->parse($input);
+        $this->doConfigure($hierarchy, $config);
+    }
 	
-	/**
-	 * Parses the given configuration and returns the parsed configuration
-	 * as a PHP array. Does not perform any configuration. 
-	 * 
-	 * If no configuration is given, or if the given configuration cannot be
-	 * parsed for whatever reason, a warning will be issued, and the default 
-	 * configuration will be returned ({@link $defaultConfiguration}).
-	 * 
-	 * @param string|array $input Either path to the config file or the 
-	 * 		configuration as an array. If not set, default configuration 
-	 * 		will be used.
-	 * @return array The parsed configuration.
-	 */
-	public function parse($input)
-	{
-		// No input - use default configuration
-		if (!isset($input)) {
-			$config = self::$defaultConfiguration;
-		}
+    /**
+     * Parses the given configuration and returns the parsed configuration
+     * as a PHP array. Does not perform any configuration. 
+     * 
+     * If no configuration is given, or if the given configuration cannot be
+     * parsed for whatever reason, a warning will be issued, and the default 
+     * configuration will be returned ({@link $defaultConfiguration}).
+     * 
+     * @param string|array $input Either path to the config file or the 
+     * 		configuration as an array. If not set, default configuration 
+     * 		will be used.
+     * @return array The parsed configuration.
+     */
+    public function parse($input)
+    {
+        // No input - use default configuration
+        if (!isset($input)) {
+            $config = self::$defaultConfiguration;
+        }
 		
-		// Array input - contains configuration within the array
-		else if (is_array($input)) {
-			$config = $input;
-		}
+        // Array input - contains configuration within the array
+        else if (is_array($input)) {
+            $config = $input;
+        }
 		
-		// String input - contains path to configuration file
-		else if (is_string($input)) {
-			try {
-				$config = $this->parseFile($input);
-			} catch (Payone_Log4php_LoggerException $e) {
-				$this->warn("Configuration failed. " . $e->getMessage() . " Using default configuration.");
-				$config = self::$defaultConfiguration;
-			}
-		}
+        // String input - contains path to configuration file
+        else if (is_string($input)) {
+            try {
+                $config = $this->parseFile($input);
+            } catch (Payone_Log4php_LoggerException $e) {
+                $this->warn("Configuration failed. " . $e->getMessage() . " Using default configuration.");
+                $config = self::$defaultConfiguration;
+            }
+        }
 		
-		// Anything else is an error
-		else {
-			$this->warn("Invalid configuration param given. Reverting to default configuration.");
-			$config = self::$defaultConfiguration;
-		}
+        // Anything else is an error
+        else {
+            $this->warn("Invalid configuration param given. Reverting to default configuration.");
+            $config = self::$defaultConfiguration;
+        }
 		
-		return $config;
-	}
+        return $config;
+    }
 
-	/** 
-	 * Returns the default log4php configuration.
-	 * @return array
-	 */
-	public static function getDefaultConfiguration() {
-		return self::$defaultConfiguration;
-	} 
+    /** 
+     * Returns the default log4php configuration.
+     * @return array
+     */
+    public static function getDefaultConfiguration() {
+        return self::$defaultConfiguration;
+    } 
 	
-	/**
-	 * Loads the configuration file from the given URL, determines which
-	 * adapter to use, converts the configuration to a PHP array and
-	 * returns it.
-	 *
-	 * @param string $url Path to the config file.
-	 * @return The configuration from the config file, as a PHP array.
-	 * @throws LoggerException If the configuration file cannot be loaded, or
-	 * 		if the parsing fails.
-	 */
-	private function parseFile($url) {
+    /**
+     * Loads the configuration file from the given URL, determines which
+     * adapter to use, converts the configuration to a PHP array and
+     * returns it.
+     *
+     * @param string $url Path to the config file.
+     * @return The configuration from the config file, as a PHP array.
+     * @throws LoggerException If the configuration file cannot be loaded, or
+     * 		if the parsing fails.
+     */
+    private function parseFile($url) {
 		
-		if (!file_exists($url)) {
-			throw new Payone_Log4php_LoggerException("File not found at [$url].");
-		}
+        if (!file_exists($url)) {
+            throw new Payone_Log4php_LoggerException("File not found at [$url].");
+        }
 		
-		$type = $this->getConfigType($url);
-		$adapterClass = $this->adapters[$type];
+        $type = $this->getConfigType($url);
+        $adapterClass = $this->adapters[$type];
 
-		$adapter = new $adapterClass();
-		return $adapter->convert($url);
-	}
+        $adapter = new $adapterClass();
+        return $adapter->convert($url);
+    }
 	
-	/** Determines configuration file type based on the file extension. */
-	private function getConfigType($url) {
-		$info = pathinfo($url);
-		$ext = strtolower($info['extension']);
+    /** Determines configuration file type based on the file extension. */
+    private function getConfigType($url) {
+        $info = pathinfo($url);
+        $ext = strtolower($info['extension']);
 		
-		switch($ext) {
-			case 'xml':
-				return self::FORMAT_XML;
+        switch($ext) {
+            case 'xml':
+                return self::FORMAT_XML;
 			
-			case 'ini':
-			case 'properties':
-				return self::FORMAT_INI;
+            case 'ini':
+            case 'properties':
+                return self::FORMAT_INI;
 			
-			case 'php':
-				return self::FORMAT_PHP;
+            case 'php':
+                return self::FORMAT_PHP;
 				
-			default:
-				throw new Payone_Log4php_LoggerException("Unsupported configuration file extension: $ext");
-		}
-	}
+            default:
+                throw new Payone_Log4php_LoggerException("Unsupported configuration file extension: $ext");
+        }
+    }
 	
-	/**
-	 * Constructs the logger hierarchy based on configuration.
-	 * 
-	 * @param Payone_Log4php_LoggerHierarchy $hierarchy
-	 * @param array $config
-	 */
-	private function doConfigure(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
-		if (isset($config['threshold'])) {
-			$threshold = Payone_Log4php_LoggerLevel::toLevel($config['threshold']);
-			if (isset($threshold)) {
-				$hierarchy->setThreshold($threshold);
-			} else {
-				$this->warn("Invalid threshold value [{$config['threshold']}] specified. Ignoring threshold definition.");
-			}
-		}
+    /**
+     * Constructs the logger hierarchy based on configuration.
+     * 
+     * @param Payone_Log4php_LoggerHierarchy $hierarchy
+     * @param array $config
+     */
+    private function doConfigure(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
+        if (isset($config['threshold'])) {
+            $threshold = Payone_Log4php_LoggerLevel::toLevel($config['threshold']);
+            if (isset($threshold)) {
+                $hierarchy->setThreshold($threshold);
+            } else {
+                $this->warn("Invalid threshold value [{$config['threshold']}] specified. Ignoring threshold definition.");
+            }
+        }
 		
-		// Configure appenders and add them to the appender pool
-		if (isset($config['appenders']) && is_array($config['appenders'])) {
-			foreach($config['appenders'] as $name => $appenderConfig) {
-				$this->configureAppender($name, $appenderConfig);
-			}
-		}
+        // Configure appenders and add them to the appender pool
+        if (isset($config['appenders']) && is_array($config['appenders'])) {
+            foreach($config['appenders'] as $name => $appenderConfig) {
+                $this->configureAppender($name, $appenderConfig);
+            }
+        }
 		
-		// Configure root logger 
-		if (isset($config['rootLogger'])) {
-			$this->configureRootLogger($hierarchy, $config['rootLogger']);
-		}
+        // Configure root logger 
+        if (isset($config['rootLogger'])) {
+            $this->configureRootLogger($hierarchy, $config['rootLogger']);
+        }
 		
-		// Configure loggers
-		if (isset($config['loggers']) && is_array($config['loggers'])) {
-			foreach($config['loggers'] as $loggerName => $loggerConfig) {
-				$this->configureOtherLogger($hierarchy, $loggerName, $loggerConfig);
-			}
-		}
+        // Configure loggers
+        if (isset($config['loggers']) && is_array($config['loggers'])) {
+            foreach($config['loggers'] as $loggerName => $loggerConfig) {
+                $this->configureOtherLogger($hierarchy, $loggerName, $loggerConfig);
+            }
+        }
 
-		// Configure renderers
-		if (isset($config['renderers']) && is_array($config['renderers'])) {
-			foreach($config['renderers'] as $rendererConfig) {
-				$this->configureRenderer($hierarchy, $rendererConfig);
-			}
-		}
-	}
+        // Configure renderers
+        if (isset($config['renderers']) && is_array($config['renderers'])) {
+            foreach($config['renderers'] as $rendererConfig) {
+                $this->configureRenderer($hierarchy, $rendererConfig);
+            }
+        }
+    }
 	
-	private function configureRenderer(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
-		if (!isset($config['renderingClass'])) {
-			$this->warn("Rendering class not specified. Skipping renderers definition.");
-			return;			
-		}
+    private function configureRenderer(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
+        if (!isset($config['renderingClass'])) {
+            $this->warn("Rendering class not specified. Skipping renderers definition.");
+            return;			
+        }
 		
-		$renderingClass = $config['renderingClass'];
-		if (!class_exists($renderingClass)) {
-			$this->warn("Nonexistant rendering class [$renderingClass] specified. Skipping renderers definition.");
-			return;
-		}
+        $renderingClass = $config['renderingClass'];
+        if (!class_exists($renderingClass)) {
+            $this->warn("Nonexistant rendering class [$renderingClass] specified. Skipping renderers definition.");
+            return;
+        }
 		
-		$renderingClassInstance = new $renderingClass();
-		if (!$renderingClassInstance instanceof Payone_Log4php_LoggerRendererObject) {
-			$this->warn("Invalid class [$renderingClass] given. Not a valid Payone_Log4php_LoggerRenderer class. Skipping renderers definition.");
-			return;			
-		}
+        $renderingClassInstance = new $renderingClass();
+        if (!$renderingClassInstance instanceof Payone_Log4php_LoggerRendererObject) {
+            $this->warn("Invalid class [$renderingClass] given. Not a valid Payone_Log4php_LoggerRenderer class. Skipping renderers definition.");
+            return;			
+        }
 	
-		if (!isset($config['renderedClass'])) {
-			$this->warn("Rendered class not specified for rendering Class [$renderingClass]. Skipping renderers definition.");
-			return;			
-		}
+        if (!isset($config['renderedClass'])) {
+            $this->warn("Rendered class not specified for rendering Class [$renderingClass]. Skipping renderers definition.");
+            return;			
+        }
 		
-		$renderedClass = $config['renderedClass'];
-		if (!class_exists($renderedClass)) {
-			$this->warn("Nonexistant rendered class [$renderedClass] specified for renderer [$renderingClass]. Skipping renderers definition.");
-			return;
-		}		
+        $renderedClass = $config['renderedClass'];
+        if (!class_exists($renderedClass)) {
+            $this->warn("Nonexistant rendered class [$renderedClass] specified for renderer [$renderingClass]. Skipping renderers definition.");
+            return;
+        }		
 
-		$hierarchy->getRendererMap()->addRenderer($renderedClass, $renderingClassInstance);
-	}
+        $hierarchy->getRendererMap()->addRenderer($renderedClass, $renderingClassInstance);
+    }
 	
-	/** 
-	 * Configures an appender based on given config and saves it to 
-	 * {@link $appenders} array so it can be later linked to loggers. 
-	 * @param string $name Appender name. 
-	 * @param array $config Appender configuration options.
-	 */
-	private function configureAppender($name, $config) {
+    /** 
+     * Configures an appender based on given config and saves it to 
+     * {@link $appenders} array so it can be later linked to loggers. 
+     * @param string $name Appender name. 
+     * @param array $config Appender configuration options.
+     */
+    private function configureAppender($name, $config) {
 
-		// TODO: add this check to other places where it might be useful
-		if (!is_array($config)) {
-			$type = gettype($config);
-			$this->warn("Invalid configuration provided for appender [$name]. Expected an array, found <$type>. Skipping appender definition.");
-			return;
-		}
+        // TODO: add this check to other places where it might be useful
+        if (!is_array($config)) {
+            $type = gettype($config);
+            $this->warn("Invalid configuration provided for appender [$name]. Expected an array, found <$type>. Skipping appender definition.");
+            return;
+        }
 		
-		// Parse appender class
-		$class = $config['class'];
-		if (empty($class)) {
-			$this->warn("No class given for appender [$name]. Skipping appender definition.");
-			return;
-		}
-		if (!class_exists($class)) {
-			$this->warn("Invalid class [$class] given for appender [$name]. Class does not exist. Skipping appender definition.");
-			return;
-		}
+        // Parse appender class
+        $class = $config['class'];
+        if (empty($class)) {
+            $this->warn("No class given for appender [$name]. Skipping appender definition.");
+            return;
+        }
+        if (!class_exists($class)) {
+            $this->warn("Invalid class [$class] given for appender [$name]. Class does not exist. Skipping appender definition.");
+            return;
+        }
 		
-		// Instantiate the appender
-		$appender = new $class($name);
-		if (!($appender instanceof Payone_Log4php_LoggerAppender)) {
-			$this->warn("Invalid class [$class] given for appender [$name]. Not a valid Payone_Log4php_LoggerAppender class. Skipping appender definition.");
-			return;
-		}
+        // Instantiate the appender
+        $appender = new $class($name);
+        if (!($appender instanceof Payone_Log4php_LoggerAppender)) {
+            $this->warn("Invalid class [$class] given for appender [$name]. Not a valid Payone_Log4php_LoggerAppender class. Skipping appender definition.");
+            return;
+        }
 		
-		// Parse the appender threshold
-		if (isset($config['threshold'])) {
-			$threshold = Payone_Log4php_LoggerLevel::toLevel($config['threshold']);
-			if ($threshold instanceof Payone_Log4php_LoggerLevel) {
-				$appender->setThreshold($threshold);
-			} else {
-				$this->warn("Invalid threshold value [{$config['threshold']}] specified for appender [$name]. Ignoring threshold definition.");
-			}
-		}
+        // Parse the appender threshold
+        if (isset($config['threshold'])) {
+            $threshold = Payone_Log4php_LoggerLevel::toLevel($config['threshold']);
+            if ($threshold instanceof Payone_Log4php_LoggerLevel) {
+                $appender->setThreshold($threshold);
+            } else {
+                $this->warn("Invalid threshold value [{$config['threshold']}] specified for appender [$name]. Ignoring threshold definition.");
+            }
+        }
 		
-		// Parse the appender layout
-		if ($appender->requiresLayout() && isset($config['layout'])) {
-			$this->createAppenderLayout($appender, $config['layout']);
-		}
+        // Parse the appender layout
+        if ($appender->requiresLayout() && isset($config['layout'])) {
+            $this->createAppenderLayout($appender, $config['layout']);
+        }
 		
-		// Parse filters
-		if (isset($config['filters']) && is_array($config['filters'])) {
-			foreach($config['filters'] as $filterConfig) {
-				$this->createAppenderFilter($appender, $filterConfig);
-			}
-		}
+        // Parse filters
+        if (isset($config['filters']) && is_array($config['filters'])) {
+            foreach($config['filters'] as $filterConfig) {
+                $this->createAppenderFilter($appender, $filterConfig);
+            }
+        }
 		
-		// Set options if any
-		if (isset($config['params'])) {
-			$this->setOptions($appender, $config['params']);
-		}
+        // Set options if any
+        if (isset($config['params'])) {
+            $this->setOptions($appender, $config['params']);
+        }
 
-		// Activate and save for later linking to loggers
-		$appender->activateOptions();
-		$this->appenders[$name] = $appender;
-	}
+        // Activate and save for later linking to loggers
+        $appender->activateOptions();
+        $this->appenders[$name] = $appender;
+    }
 	
-	/**
-	 * Parses layout config, creates the layout and links it to the appender.
-	 * @param Payone_Log4php_LoggerAppender $appender
-	 * @param array $config Layout configuration.
-	 */
-	private function createAppenderLayout(Payone_Log4php_LoggerAppender $appender, $config) {
-		$name = $appender->getName();
-		$class = $config['class'];
-		if (empty($class)) {
-			$this->warn("Layout class not specified for appender [$name]. Reverting to default layout.");
-			return;
-		}
-		if (!class_exists($class)) {
-			$this->warn("Nonexistant layout class [$class] specified for appender [$name]. Reverting to default layout.");
-			return;
-		}
+    /**
+     * Parses layout config, creates the layout and links it to the appender.
+     * @param Payone_Log4php_LoggerAppender $appender
+     * @param array $config Layout configuration.
+     */
+    private function createAppenderLayout(Payone_Log4php_LoggerAppender $appender, $config) {
+        $name = $appender->getName();
+        $class = $config['class'];
+        if (empty($class)) {
+            $this->warn("Layout class not specified for appender [$name]. Reverting to default layout.");
+            return;
+        }
+        if (!class_exists($class)) {
+            $this->warn("Nonexistant layout class [$class] specified for appender [$name]. Reverting to default layout.");
+            return;
+        }
 		
-		$layout = new $class();
-		if (!($layout instanceof Payone_Log4php_LoggerLayout)) {
-			$this->warn("Invalid layout class [$class] sepcified for appender [$name]. Reverting to default layout.");
-			return;
-		}
+        $layout = new $class();
+        if (!($layout instanceof Payone_Log4php_LoggerLayout)) {
+            $this->warn("Invalid layout class [$class] sepcified for appender [$name]. Reverting to default layout.");
+            return;
+        }
 		
-		if (isset($config['params'])) {
-			$this->setOptions($layout, $config['params']);
-		}
+        if (isset($config['params'])) {
+            $this->setOptions($layout, $config['params']);
+        }
 		
-		$layout->activateOptions();
-		$appender->setLayout($layout);
-	}
+        $layout->activateOptions();
+        $appender->setLayout($layout);
+    }
 	
-	/**
-	 * Parses filter config, creates the filter and adds it to the appender's 
-	 * filter chain.
-	 * @param Payone_Log4php_LoggerAppender $appender
-	 * @param array $config Filter configuration.
-	 */
-	private function createAppenderFilter(Payone_Log4php_LoggerAppender $appender, $config) {
-		$name = $appender->getName();
-		$class = $config['class'];
-		if (!class_exists($class)) {
-			$this->warn("Nonexistant filter class [$class] specified on appender [$name]. Skipping filter definition.");
-			return;
-		}
+    /**
+     * Parses filter config, creates the filter and adds it to the appender's 
+     * filter chain.
+     * @param Payone_Log4php_LoggerAppender $appender
+     * @param array $config Filter configuration.
+     */
+    private function createAppenderFilter(Payone_Log4php_LoggerAppender $appender, $config) {
+        $name = $appender->getName();
+        $class = $config['class'];
+        if (!class_exists($class)) {
+            $this->warn("Nonexistant filter class [$class] specified on appender [$name]. Skipping filter definition.");
+            return;
+        }
 	
-		$filter = new $class();
-		if (!($filter instanceof Payone_Log4php_LoggerFilter)) {
-			$this->warn("Invalid filter class [$class] sepcified on appender [$name]. Skipping filter definition.");
-			return;
-		}
+        $filter = new $class();
+        if (!($filter instanceof Payone_Log4php_LoggerFilter)) {
+            $this->warn("Invalid filter class [$class] sepcified on appender [$name]. Skipping filter definition.");
+            return;
+        }
 	
-		if (isset($config['params'])) {
-			$this->setOptions($filter, $config['params']);
-		}
+        if (isset($config['params'])) {
+            $this->setOptions($filter, $config['params']);
+        }
 	
-		$filter->activateOptions();
-		$appender->addFilter($filter);
-	}
+        $filter->activateOptions();
+        $appender->addFilter($filter);
+    }
 	
-	/** 
-	 * Configures the root logger
-	 * @see configureLogger() 
-	 */
-	private function configureRootLogger(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
-		$logger = $hierarchy->getRootLogger();
-		$this->configureLogger($logger, $config);
-	}
+    /** 
+     * Configures the root logger
+     * @see configureLogger() 
+     */
+    private function configureRootLogger(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
+        $logger = $hierarchy->getRootLogger();
+        $this->configureLogger($logger, $config);
+    }
 
-	/**
-	 * Configures a logger which is not root.
-	 * @see configureLogger()
-	 */
-	private function configureOtherLogger(Payone_Log4php_LoggerHierarchy $hierarchy, $name, $config) {
-		// Get logger from hierarchy (this creates it if it doesn't already exist)
-		$logger = $hierarchy->getLogger($name);
-		$this->configureLogger($logger, $config);
-	}
+    /**
+     * Configures a logger which is not root.
+     * @see configureLogger()
+     */
+    private function configureOtherLogger(Payone_Log4php_LoggerHierarchy $hierarchy, $name, $config) {
+        // Get logger from hierarchy (this creates it if it doesn't already exist)
+        $logger = $hierarchy->getLogger($name);
+        $this->configureLogger($logger, $config);
+    }
 	
-	/**
-	 * Configures a logger. 
-	 * 
-	 * @param Logger $logger The logger to configure
-	 * @param array $config Logger configuration options.
-	 */
-	private function configureLogger(Payone_Log4php_Logger $logger, $config) {
-		$loggerName = $logger->getName();
+    /**
+     * Configures a logger. 
+     * 
+     * @param Logger $logger The logger to configure
+     * @param array $config Logger configuration options.
+     */
+    private function configureLogger(Payone_Log4php_Logger $logger, $config) {
+        $loggerName = $logger->getName();
 		
-		// Set logger level
-		if (isset($config['level'])) {
-			$level = Payone_Log4php_LoggerLevel::toLevel($config['level']);
-			if (isset($level)) {
-				$logger->setLevel($level);
-			} else {
-				$default = $logger->getLevel();
-				$this->warn("Invalid level value [{$config['level']}] specified for logger [$loggerName]. Ignoring level definition.");
-			}
-		}
+        // Set logger level
+        if (isset($config['level'])) {
+            $level = Payone_Log4php_LoggerLevel::toLevel($config['level']);
+            if (isset($level)) {
+                $logger->setLevel($level);
+            } else {
+                $default = $logger->getLevel();
+                $this->warn("Invalid level value [{$config['level']}] specified for logger [$loggerName]. Ignoring level definition.");
+            }
+        }
 		
-		// Link appenders to logger
-		if (isset($config['appenders'])) {
-			foreach($config['appenders'] as $appenderName) {
-				if (isset($this->appenders[$appenderName])) {
-					$logger->addAppender($this->appenders[$appenderName]);
-				} else {
-					$this->warn("Nonexistnant appender [$appenderName] linked to logger [$loggerName].");
-				}
-			}
-		}
+        // Link appenders to logger
+        if (isset($config['appenders'])) {
+            foreach($config['appenders'] as $appenderName) {
+                if (isset($this->appenders[$appenderName])) {
+                    $logger->addAppender($this->appenders[$appenderName]);
+                } else {
+                    $this->warn("Nonexistnant appender [$appenderName] linked to logger [$loggerName].");
+                }
+            }
+        }
 		
-		// Set logger additivity
-		if (isset($config['additivity'])) {
-			$additivity = Payone_Log4php_LoggerOptionConverter::toBoolean($config['additivity'], null);
-			if (is_bool($additivity)) {
-				$logger->setAdditivity($additivity);
-			} else {
-				$this->warn("Invalid additivity value [{$config['additivity']}] specified for logger [$loggerName]. Ignoring additivity setting.");
-			}
-		}
-	}
+        // Set logger additivity
+        if (isset($config['additivity'])) {
+            $additivity = Payone_Log4php_LoggerOptionConverter::toBoolean($config['additivity'], null);
+            if (is_bool($additivity)) {
+                $logger->setAdditivity($additivity);
+            } else {
+                $this->warn("Invalid additivity value [{$config['additivity']}] specified for logger [$loggerName]. Ignoring additivity setting.");
+            }
+        }
+    }
 
-	/**
-	 * Helper method which applies given options to an object which has setters
-	 * for these options (such as appenders, layouts, etc.).
-	 * 
-	 * For example, if options are:
-	 * <code>
-	 * array(
-	 * 	'file' => '/tmp/myfile.log',
-	 * 	'append' => true
-	 * )
-	 * </code>
-	 * 
-	 * This method will call:
-	 * <code>
-	 * $object->setFile('/tmp/myfile.log')
-	 * $object->setAppend(true)
-	 * </code>
-	 * 
-	 * If required setters do not exist, it will produce a warning. 
-	 * 
-	 * @param mixed $object The object to configure.
-	 * @param unknown_type $options
-	 */
-	private function setOptions($object, $options) {
-		foreach($options as $name => $value) {
-			$setter = "set$name";
-			if (method_exists($object, $setter)) {
-				$object->$setter($value);
-			} else {
-				$class = get_class($object);
-				$this->warn("Nonexistant option [$name] specified on [$class]. Skipping.");
-			}
-		}
-	}
+    /**
+     * Helper method which applies given options to an object which has setters
+     * for these options (such as appenders, layouts, etc.).
+     * 
+     * For example, if options are:
+     * <code>
+     * array(
+     * 	'file' => '/tmp/myfile.log',
+     * 	'append' => true
+     * )
+     * </code>
+     * 
+     * This method will call:
+     * <code>
+     * $object->setFile('/tmp/myfile.log')
+     * $object->setAppend(true)
+     * </code>
+     * 
+     * If required setters do not exist, it will produce a warning. 
+     * 
+     * @param mixed $object The object to configure.
+     * @param unknown_type $options
+     */
+    private function setOptions($object, $options) {
+        foreach($options as $name => $value) {
+            $setter = "set$name";
+            if (method_exists($object, $setter)) {
+                $object->$setter($value);
+            } else {
+                $class = get_class($object);
+                $this->warn("Nonexistant option [$name] specified on [$class]. Skipping.");
+            }
+        }
+    }
 	
-	/** Helper method to simplify error reporting. */
-	private function warn($message) {
-		trigger_error("log4php: $message", E_USER_WARNING);
-	}
+    /** Helper method to simplify error reporting. */
+    private function warn($message) {
+        trigger_error("log4php: $message", E_USER_WARNING);
+    }
 }
\ No newline at end of file

lib/Payone/Log4php/LoggerPatternConverter.php

Indentation +82 added lines, -82 removed lines

@@ -33,99 +33,99 @@
  */
 abstract class Payone_Log4php_LoggerPatternConverter {
 	
-	/**
-	 * Next converter in the converter chain.
-	 * @var Payone_Log4php_LoggerPatternConverter
-	 */
-	public $next = null;
+    /**
+     * Next converter in the converter chain.
+     * @var Payone_Log4php_LoggerPatternConverter
+     */
+    public $next = null;
 	
-	/**
-	 * Formatting information, parsed from pattern modifiers. 
-	 * @var Payone_Log4php_LoggerFormattingInfo
-	 */
-	protected $formattingInfo;
+    /**
+     * Formatting information, parsed from pattern modifiers. 
+     * @var Payone_Log4php_LoggerFormattingInfo
+     */
+    protected $formattingInfo;
 	
-	/**
-	 * Converter-specific formatting options.
-	 * @var array
-	 */
-	protected $option;
+    /**
+     * Converter-specific formatting options.
+     * @var array
+     */
+    protected $option;
 
-	/**
-	 * Constructor 
-	 * @param Payone_Log4php_LoggerFormattingInfo $formattingInfo
-	 * @param array $option
-	 */
-	public function __construct(Payone_Log4php_LoggerFormattingInfo $formattingInfo = null, $option = null) {
-		$this->formattingInfo = $formattingInfo;
-		$this->option = $option;
-		$this->activateOptions();
-	}
+    /**
+     * Constructor 
+     * @param Payone_Log4php_LoggerFormattingInfo $formattingInfo
+     * @param array $option
+     */
+    public function __construct(Payone_Log4php_LoggerFormattingInfo $formattingInfo = null, $option = null) {
+        $this->formattingInfo = $formattingInfo;
+        $this->option = $option;
+        $this->activateOptions();
+    }
 	
-	/**
-	 * Called in constructor. Converters which need to process the options 
-	 * can override this method. 
-	 */
-	public function activateOptions() { }
+    /**
+     * Called in constructor. Converters which need to process the options 
+     * can override this method. 
+     */
+    public function activateOptions() { }
   
-	/**
-	 * Converts the logging event to the desired format. Derived pattern 
-	 * converters must implement this method.
-	 *
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 */
-	abstract public function convert(Payone_Log4php_LoggerLoggingEvent $event);
+    /**
+     * Converts the logging event to the desired format. Derived pattern 
+     * converters must implement this method.
+     *
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     */
+    abstract public function convert(Payone_Log4php_LoggerLoggingEvent $event);
 
-	/**
-	 * Converts the event and formats it according to setting in the 
-	 * Formatting information object.
-	 *
-	 * @param string &$sbuf string buffer to write to
-	 * @param Payone_Log4php_LoggerLoggingEvent $event Event to be formatted.
-	 */
-	public function format(&$sbuf, $event) {
-		$string = $this->convert($event);
+    /**
+     * Converts the event and formats it according to setting in the 
+     * Formatting information object.
+     *
+     * @param string &$sbuf string buffer to write to
+     * @param Payone_Log4php_LoggerLoggingEvent $event Event to be formatted.
+     */
+    public function format(&$sbuf, $event) {
+        $string = $this->convert($event);
 		
-		if (!isset($this->formattingInfo)) {
-			$sbuf .= $string;
-			return;	
-		}
+        if (!isset($this->formattingInfo)) {
+            $sbuf .= $string;
+            return;	
+        }
 		
-		$fi = $this->formattingInfo;
+        $fi = $this->formattingInfo;
 		
-		// Empty string
-		if($string === '' || is_null($string)) {
-			if($fi->min > 0) {
-				$sbuf .= str_repeat(' ', $fi->min);
-			}
-			return;
-		}
+        // Empty string
+        if($string === '' || is_null($string)) {
+            if($fi->min > 0) {
+                $sbuf .= str_repeat(' ', $fi->min);
+            }
+            return;
+        }
 		
-		$len = strlen($string);
+        $len = strlen($string);
 	
-		// Trim the string if needed
-		if($len > $fi->max) {
-			if ($fi->trimLeft) {
-				$sbuf .= substr($string, $len - $fi->max, $fi->max);
-			} else {
-				$sbuf .= substr($string , 0, $fi->max);
-			}
-		}
+        // Trim the string if needed
+        if($len > $fi->max) {
+            if ($fi->trimLeft) {
+                $sbuf .= substr($string, $len - $fi->max, $fi->max);
+            } else {
+                $sbuf .= substr($string , 0, $fi->max);
+            }
+        }
 		
-		// Add padding if needed
-		else if($len < $fi->min) {
-			if($fi->padLeft) {
-				$sbuf .= str_repeat(' ', $fi->min - $len);
-				$sbuf .= $string;
-			} else {
-				$sbuf .= $string;
-				$sbuf .= str_repeat(' ', $fi->min - $len);
-			}
-		}
+        // Add padding if needed
+        else if($len < $fi->min) {
+            if($fi->padLeft) {
+                $sbuf .= str_repeat(' ', $fi->min - $len);
+                $sbuf .= $string;
+            } else {
+                $sbuf .= $string;
+                $sbuf .= str_repeat(' ', $fi->min - $len);
+            }
+        }
 		
-		// No action needed
-		else {
-			$sbuf .= $string;
-		}
-	}
+        // No action needed
+        else {
+            $sbuf .= $string;
+        }
+    }
 }

lib/Payone/Log4php/LoggerAppenderDailyFile.php

Indentation +50 added lines, -50 removed lines

@@ -52,59 +52,59 @@
  */
 class Payone_Log4php_LoggerAppenderDailyFile extends Payone_Log4php_LoggerAppenderFile {
 
-	/**
-	 * Format date. 
-	 * It follows the {@link PHP_MANUAL#date()} formatting rules and <b>should always be set before {@link $file} param</b>.
-	 * @var string
-	 */
-	protected $datePattern = "Ymd";
+    /**
+     * Format date. 
+     * It follows the {@link PHP_MANUAL#date()} formatting rules and <b>should always be set before {@link $file} param</b>.
+     * @var string
+     */
+    protected $datePattern = "Ymd";
 	
-	/**
-	 * Sets date format for the file name.
-	 * @param string $datePattern a regular date() string format
-	 */
-	public function setDatePattern($datePattern) {
-		$this->setString('datePattern', $datePattern);
-	}
+    /**
+     * Sets date format for the file name.
+     * @param string $datePattern a regular date() string format
+     */
+    public function setDatePattern($datePattern) {
+        $this->setString('datePattern', $datePattern);
+    }
 	
-	/**
-	 * @return string returns date format for the filename
-	 */
-	public function getDatePattern() {
-		return $this->datePattern;
-	}
+    /**
+     * @return string returns date format for the filename
+     */
+    public function getDatePattern() {
+        return $this->datePattern;
+    }
 	
-	/** 
-	 * Similar to parent method, but but replaces "%s" in the file name with 
-	 * the current date in format specified by the 'datePattern' parameter.
-	 */ 
-	public function activateOptions() {
-		$fileName = $this->getFile();
-		$date = date($this->getDatePattern());
-		$fileName = sprintf($fileName, $date);
+    /** 
+     * Similar to parent method, but but replaces "%s" in the file name with 
+     * the current date in format specified by the 'datePattern' parameter.
+     */ 
+    public function activateOptions() {
+        $fileName = $this->getFile();
+        $date = date($this->getDatePattern());
+        $fileName = sprintf($fileName, $date);
 		
-		if(!is_file($fileName)) {
-			$dir = dirname($fileName);
-			if(!is_dir($dir)) {
-				mkdir($dir, 0777, true);
-			}
-		}
+        if(!is_file($fileName)) {
+            $dir = dirname($fileName);
+            if(!is_dir($dir)) {
+                mkdir($dir, 0777, true);
+            }
+        }
 	
-		$this->fp = fopen($fileName, ($this->getAppend()? 'a':'w'));
-		if($this->fp) {
-			if(flock($this->fp, LOCK_EX)) {
-				if($this->getAppend()) {
-					fseek($this->fp, 0, SEEK_END);
-				}
-				fwrite($this->fp, $this->layout->getHeader());
-				flock($this->fp, LOCK_UN);
-				$this->closed = false;
-			} else {
-				// TODO: should we take some action in this case?
-				$this->closed = true;
-			}
-		} else {
-			$this->closed = true;
-		}
-	}
+        $this->fp = fopen($fileName, ($this->getAppend()? 'a':'w'));
+        if($this->fp) {
+            if(flock($this->fp, LOCK_EX)) {
+                if($this->getAppend()) {
+                    fseek($this->fp, 0, SEEK_END);
+                }
+                fwrite($this->fp, $this->layout->getHeader());
+                flock($this->fp, LOCK_UN);
+                $this->closed = false;
+            } else {
+                // TODO: should we take some action in this case?
+                $this->closed = true;
+            }
+        } else {
+            $this->closed = true;
+        }
+    }
 }

lib/Payone/Log4php/LoggerPatternConverterLevel.php

Indentation +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@
  */
 class Payone_Log4php_LoggerPatternConverterLevel extends Payone_Log4php_LoggerPatternConverter {
 
-	public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
-		return $event->getLevel()->toString();
-	}
+    public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
+        return $event->getLevel()->toString();
+    }
 }

lib/Payone/Log4php/LoggerPatternConverterRequest.php

Indentation +1 added lines, -1 removed lines

@@ -29,5 +29,5 @@
  * @subpackage pattern
  */
 class Payone_Log4php_LoggerPatternConverterRequest extends Payone_Log4php_LoggerPatternConverterSuperglobal {
-	protected $name = '_REQUEST';
+    protected $name = '_REQUEST';
 }
\ No newline at end of file