YetiForceCompany / YetiForceCRM

libraries/log4php.debug/appenders/LoggerAppenderMail.php

Indentation +88 added lines, -88 removed lines

@@ -38,111 +38,111 @@
  */
 class LoggerAppenderMail extends LoggerAppenderSkeleton {
 
-    /**
-     * @var string 'from' field
-     */
-    public $from = null;
+	/**
+	 * @var string 'from' field
+	 */
+	public $from = null;
 
-    /**
-     * @var string 'subject' field
-     */
-    public $subject = 'Log4php Report';
+	/**
+	 * @var string 'subject' field
+	 */
+	public $subject = 'Log4php Report';
     
-    /**
-     * @var string 'to' field
-     */
-    public $to = null;
+	/**
+	 * @var string 'to' field
+	 */
+	public $to = null;
 
-    /**
-     * @var string used to create mail body
-     * @access private
-     */
-    public $body = '';
+	/**
+	 * @var string used to create mail body
+	 * @access private
+	 */
+	public $body = '';
     
-    /**
-     * @access private
-     */
-    public $requiresLayout = true;
+	/**
+	 * @access private
+	 */
+	public $requiresLayout = true;
     
-    /**
-     * Constructor.
-     *
-     * @param string $name appender name
-     */
-    public function LoggerAppenderMail($name)
-    {
-        $this->LoggerAppenderSkeleton($name);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name appender name
+	 */
+	public function LoggerAppenderMail($name)
+	{
+		$this->LoggerAppenderSkeleton($name);
+	}
 
-    public function activateOptions()
-    {
-        $this->closed = false;
-        return;
-    }
+	public function activateOptions()
+	{
+		$this->closed = false;
+		return;
+	}
     
-    public function close()
-    {
-        $from       = $this->getFrom();
-        $to         = $this->getTo();
+	public function close()
+	{
+		$from       = $this->getFrom();
+		$to         = $this->getTo();
 
-        if (!empty($this->body) && $from !== null && $to !== null && $this->layout !== null) {
+		if (!empty($this->body) && $from !== null && $to !== null && $this->layout !== null) {
 
-            $subject    = $this->getSubject();            
+			$subject    = $this->getSubject();            
 
-            LoggerLog::debug("LoggerAppenderMail::close() sending mail from=[{$from}] to=[{$to}] subject=[{$subject}]");
+			LoggerLog::debug("LoggerAppenderMail::close() sending mail from=[{$from}] to=[{$to}] subject=[{$subject}]");
             
-            @mail(
-                $to, $subject, 
-                $this->layout->getHeader() . $this->body . $this->layout->getFooter(),
-                "From: {$from}\r\n"
-            );
-        }
-        $this->closed = true;
-    }
+			@mail(
+				$to, $subject, 
+				$this->layout->getHeader() . $this->body . $this->layout->getFooter(),
+				"From: {$from}\r\n"
+			);
+		}
+		$this->closed = true;
+	}
     
-    /**
-     * @return string
-     */
-    public function getFrom()
-    {
-        return $this->from;
-    }
+	/**
+	 * @return string
+	 */
+	public function getFrom()
+	{
+		return $this->from;
+	}
     
-    /**
-     * @return string
-     */
-    public function getSubject()
-    {
-        return $this->subject;
-    }
+	/**
+	 * @return string
+	 */
+	public function getSubject()
+	{
+		return $this->subject;
+	}
 
-    /**
-     * @return string
-     */
-    public function getTo()
-    {
-        return $this->to;
-    }
+	/**
+	 * @return string
+	 */
+	public function getTo()
+	{
+		return $this->to;
+	}
     
-    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 setFrom($from)
-    {
-        $this->from = $from;
-    }  
+	public function setFrom($from)
+	{
+		$this->from = $from;
+	}  
 
-    public function append($event)
-    {
-        if ($this->layout !== null)
-            $this->body .= $this->layout->format($event);
-    }
+	public function append($event)
+	{
+		if ($this->layout !== null)
+			$this->body .= $this->layout->format($event);
+	}
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/appenders/LoggerAppenderFile.php

Indentation +118 added lines, -118 removed lines

@@ -39,146 +39,146 @@
  */
 class LoggerAppenderFile extends LoggerAppenderSkeleton {
 
-    /**
-     * @var boolean if {@link $file} exists, appends events.
-     */
-    public $append = true;  
+	/**
+	 * @var boolean if {@link $file} exists, appends events.
+	 */
+	public $append = true;  
 
-    /**
-     * @var string the file name used to append events
-     */
-    public $fileName;
+	/**
+	 * @var string the file name used to append events
+	 */
+	public $fileName;
 
-    /**
-     * @var mixed file resource
-     * @access private
-     */
-    public $fp = false;
+	/**
+	 * @var mixed file resource
+	 * @access private
+	 */
+	public $fp = false;
     
-    /**
-     * @access private
-     */
-    public $requiresLayout = true;
+	/**
+	 * @access private
+	 */
+	public $requiresLayout = true;
     
-    /**
-     * Constructor.
-     *
-     * @param string $name appender name
-     */
-    public function LoggerAppenderFile($name)
-    {
-        $this->LoggerAppenderSkeleton($name);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name appender name
+	 */
+	public function LoggerAppenderFile($name)
+	{
+		$this->LoggerAppenderSkeleton($name);
+	}
 
-    public function activateOptions()
-    {
-        $fileName = $this->getFile();
-        LoggerLog::debug("LoggerAppenderFile::activateOptions() opening file '{$fileName}'");
-        $this->fp = @fopen($fileName, ($this->getAppend()? 'a':'w'));
+	public function activateOptions()
+	{
+		$fileName = $this->getFile();
+		LoggerLog::debug("LoggerAppenderFile::activateOptions() opening file '{$fileName}'");
+		$this->fp = @fopen($fileName, ($this->getAppend()? 'a':'w'));
 
 	// Denying read option for log file. Added for Vulnerability fix
 	if (is_readable($fileName)) chmod ($fileName,0222);
 
-        if ($this->fp) {
-            if ($this->getAppend())
-                fseek($this->fp, 0, SEEK_END);
-            @fwrite($this->fp, $this->layout->getHeader());
-            $this->closed = false;
-        } else {
-            $this->closed = true;
-        }
-    }
+		if ($this->fp) {
+			if ($this->getAppend())
+				fseek($this->fp, 0, SEEK_END);
+			@fwrite($this->fp, $this->layout->getHeader());
+			$this->closed = false;
+		} else {
+			$this->closed = true;
+		}
+	}
     
-    public function close()
-    {
-        if ($this->fp && $this->layout !== null)
-            @fwrite($this->fp, $this->layout->getFooter());
+	public function close()
+	{
+		if ($this->fp && $this->layout !== null)
+			@fwrite($this->fp, $this->layout->getFooter());
             
-        $this->closeFile();
-        $this->closed = true;
-    }
+		$this->closeFile();
+		$this->closed = true;
+	}
 
-    /**
-     * Closes the previously opened file.
-     */
-    public function closeFile() 
-    {
-        if ($this->fp)
-            @fclose($this->fp);
-    }
+	/**
+	 * Closes the previously opened file.
+	 */
+	public function closeFile() 
+	{
+		if ($this->fp)
+			@fclose($this->fp);
+	}
     
-    /**
-     * @return boolean
-     */
-    public function getAppend()
-    {
-        return $this->append;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function getAppend()
+	{
+		return $this->append;
+	}
 
-    /**
-     * @return string
-     */
-    public function getFile()
-    {
-        return $this->getFileName();
-    }
+	/**
+	 * @return string
+	 */
+	public function getFile()
+	{
+		return $this->getFileName();
+	}
     
-    /**
-     * @return string
-     */
-    public function getFileName()
-    {
-        return $this->fileName;
-    } 
+	/**
+	 * @return string
+	 */
+	public function getFileName()
+	{
+		return $this->fileName;
+	} 
  
-    /**
-     * Close any previously opened file and call the parent's reset.
-     */
-    public function reset()
-    {
-        $this->closeFile();
-        $this->fileName = null;
-        parent::reset();
-    }
+	/**
+	 * Close any previously opened file and call the parent's reset.
+	 */
+	public function reset()
+	{
+		$this->closeFile();
+		$this->fileName = null;
+		parent::reset();
+	}
 
-    public function setAppend($flag)
-    {
-        $this->append = LoggerOptionConverter::toBoolean($flag, true);        
-    } 
+	public function setAppend($flag)
+	{
+		$this->append = LoggerOptionConverter::toBoolean($flag, true);        
+	} 
   
-    /**
-     * Sets and opens the file where the log output will go.
-     *
-     * This is an overloaded method. It can be called with:
-     * - setFile(string $fileName) to set filename.
-     * - setFile(string $fileName, boolean $append) to set filename and append.
-     */
-    public function setFile()
-    {
-        $numargs = func_num_args();
-        $args    = func_get_args();
+	/**
+	 * Sets and opens the file where the log output will go.
+	 *
+	 * This is an overloaded method. It can be called with:
+	 * - setFile(string $fileName) to set filename.
+	 * - setFile(string $fileName, boolean $append) to set filename and append.
+	 */
+	public function setFile()
+	{
+		$numargs = func_num_args();
+		$args    = func_get_args();
 
-        if ($numargs == 1 && is_string($args[0])) {
-            $this->setFileName($args[0]);
-        } elseif ($numargs >=2 && is_string($args[0]) && is_bool($args[1])) {
-            $this->setFile($args[0]);
-            $this->setAppend($args[1]);
-        }
-    }
+		if ($numargs == 1 && is_string($args[0])) {
+			$this->setFileName($args[0]);
+		} elseif ($numargs >=2 && is_string($args[0]) && is_bool($args[1])) {
+			$this->setFile($args[0]);
+			$this->setAppend($args[1]);
+		}
+	}
     
-    public function setFileName($fileName)
-    {
-        $this->fileName = $fileName;
-    }
+	public function setFileName($fileName)
+	{
+		$this->fileName = $fileName;
+	}
 
-    public function append($event)
-    {
-        if ($this->fp && $this->layout !== null) {
+	public function append($event)
+	{
+		if ($this->fp && $this->layout !== null) {
 
-            LoggerLog::debug("LoggerAppenderFile::append()");
+			LoggerLog::debug("LoggerAppenderFile::append()");
         
-            @fwrite($this->fp, $this->layout->format($event));
-        } 
-    }
+			@fwrite($this->fp, $this->layout->format($event));
+		} 
+	}
 }
 ?>

libraries/log4php.debug/appenders/LoggerAppenderNull.php

Indentation +28 added lines, -28 removed lines

@@ -35,38 +35,38 @@
  */
 class LoggerAppenderNull extends LoggerAppenderSkeleton {
 
-    /**
-     * @access private
-     */
-    public $requiresLayout = false;
+	/**
+	 * @access private
+	 */
+	public $requiresLayout = false;
     
-    /**
-     * Constructor.
-     *
-     * @param string $name appender name
-     */
-    public function LoggerAppenderNull($name)
-    {
-        $this->LoggerAppenderSkeleton($name);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name appender name
+	 */
+	public function LoggerAppenderNull($name)
+	{
+		$this->LoggerAppenderSkeleton($name);
+	}
 
-    public function activateOptions()
-    { 
-        $this->closed = false;
-    }
+	public function activateOptions()
+	{ 
+		$this->closed = false;
+	}
     
-    public function close()
-    {
-        $this->closed = true;
-    }
+	public function close()
+	{
+		$this->closed = true;
+	}
     
-    /**
-     * Do nothing. How I Love it !! :)
-     */
-    public function append($event)
-    {
-        LoggerLog::debug("LoggerAppenderNull::append()");
-    }
+	/**
+	 * Do nothing. How I Love it !! :)
+	 */
+	public function append($event)
+	{
+		LoggerLog::debug("LoggerAppenderNull::append()");
+	}
 }
 
 ?>
\ No newline at end of file

libraries/log4php.debug/appenders/LoggerAppenderEcho.php

Indentation +39 added lines, -39 removed lines

@@ -39,51 +39,51 @@
  */
 class LoggerAppenderEcho extends LoggerAppenderSkeleton {
 
-    /**
-     * @access private 
-     */
-    public $requiresLayout = true;
+	/**
+	 * @access private 
+	 */
+	public $requiresLayout = true;
 
-    /**
-     * @var boolean used internally to mark first append 
-     * @access private 
-     */
-    public $firstAppend    = true;
+	/**
+	 * @var boolean used internally to mark first append 
+	 * @access private 
+	 */
+	public $firstAppend    = true;
     
-    /**
-     * Constructor.
-     *
-     * @param string $name appender name
-     */
-    public function LoggerAppenderEcho($name)
-    {
-        $this->LoggerAppenderSkeleton($name);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name appender name
+	 */
+	public function LoggerAppenderEcho($name)
+	{
+		$this->LoggerAppenderSkeleton($name);
+	}
 
-    public function activateOptions()
-    {
-        return;
-    }
+	public function activateOptions()
+	{
+		return;
+	}
     
-    public function close()
-    {
-        if (!$this->firstAppend)
-            echo $this->layout->getFooter();
-        $this->closed = true;    
-    }
+	public function close()
+	{
+		if (!$this->firstAppend)
+			echo $this->layout->getFooter();
+		$this->closed = true;    
+	}
 
-    public function append($event)
-    {
-        LoggerLog::debug("LoggerAppenderEcho::append()");
+	public function append($event)
+	{
+		LoggerLog::debug("LoggerAppenderEcho::append()");
         
-        if ($this->layout !== null) {
-            if ($this->firstAppend) {
-                echo $this->layout->getHeader();
-                $this->firstAppend = false;
-            }
-            echo $this->layout->format($event);
-        } 
-    }
+		if ($this->layout !== null) {
+			if ($this->firstAppend) {
+				echo $this->layout->getHeader();
+				$this->firstAppend = false;
+			}
+			echo $this->layout->format($event);
+		} 
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
      * @var boolean used internally to mark first append 
      * @access private 
      */
-    public $firstAppend    = true;
+    public $firstAppend = true;
     
     /**
      * Constructor.

libraries/log4php.debug/appenders/LoggerAppenderDailyFile.php

Indentation +46 added lines, -46 removed lines

@@ -40,57 +40,57 @@
  */                      
 class LoggerAppenderDailyFile extends 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
-     */
-    public $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
+	 */
+	public $datePattern = "Ymd";
     
-    /**
-    * Constructor
-    *
-    * @param string $name appender name
-    */
-    public function LoggerAppenderDailyFile($name)
-    {
-        $this->LoggerAppenderFile($name); 
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param string $name appender name
+	 */
+	public function LoggerAppenderDailyFile($name)
+	{
+		$this->LoggerAppenderFile($name); 
+	}
     
-    /**
-    * Sets date format for the file name.
-    * @param string $format a regular date() string format
-    */
-    public function setDatePattern ( $format )
-    {
-        $this->datePattern = $format;
-    }
+	/**
+	 * Sets date format for the file name.
+	 * @param string $format a regular date() string format
+	 */
+	public function setDatePattern ( $format )
+	{
+		$this->datePattern = $format;
+	}
     
-    /**
-    * @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;
+	}
     
-    /**
-    * The File property takes a string value which should be the name of the file to append to.
-    * Sets and opens the file where the log output will go.
-    *
-    * @see LoggerAppenderFile::setFile()
-    */
-    public function setFile()
-    {
-        $numargs = func_num_args();
-        $args    = func_get_args();
+	/**
+	 * The File property takes a string value which should be the name of the file to append to.
+	 * Sets and opens the file where the log output will go.
+	 *
+	 * @see LoggerAppenderFile::setFile()
+	 */
+	public function setFile()
+	{
+		$numargs = func_num_args();
+		$args    = func_get_args();
         
-        if ($numargs == 1 && is_string($args[0])) {
-            parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) );
-        } elseif ($numargs == 2 && is_string($args[0]) && is_bool($args[1])) {
-            parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] );
-        }
-    } 
+		if ($numargs == 1 && is_string($args[0])) {
+			parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())) );
+		} elseif ($numargs == 2 && is_string($args[0]) && is_bool($args[1])) {
+			parent::setFile( sprintf((string)$args[0], date($this->getDatePattern())), $args[1] );
+		}
+	} 
 
 }
 

libraries/log4php.debug/appenders/LoggerAppenderRollingFile.php

Indentation +178 added lines, -178 removed lines

@@ -39,203 +39,203 @@
  */
 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
-     */
-    public $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
+	 */
+	public $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 
-     */
-    public $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 
+	 */
+	public $maxBackupIndex  = 1;
     
-    /**
-     * @var string the filename expanded
-     * @access private
-     */
-    public $expandedFileName = null;
+	/**
+	 * @var string the filename expanded
+	 * @access private
+	 */
+	public $expandedFileName = null;
 
-    /**
-     * Constructor.
-     *
-     * @param string $name appender name
-     */
-    public function LoggerAppenderRollingFile($name)
-    {
-        $this->LoggerAppenderFile($name);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name appender name
+	 */
+	public function LoggerAppenderRollingFile($name)
+	{
+		$this->LoggerAppenderFile($name);
+	}
     
-    /**
-     * Returns the value of the MaxBackupIndex option.
-     * @return integer 
-     */
-    public function getExpandedFileName() {
-        return $this->expandedFileName;
-    }
+	/**
+	 * Returns the value of the MaxBackupIndex option.
+	 * @return integer 
+	 */
+	public function getExpandedFileName() {
+		return $this->expandedFileName;
+	}
 
-    /**
-     * Returns the value of the MaxBackupIndex option.
-     * @return integer 
-     */
-    public function getMaxBackupIndex() {
-        return $this->maxBackupIndex;
-    }
+	/**
+	 * Returns the value of the MaxBackupIndex option.
+	 * @return integer 
+	 */
+	public function getMaxBackupIndex() {
+		return $this->maxBackupIndex;
+	}
 
-    /**
-     * Get the maximum size that the output file is allowed to reach
-     * before being rolled over to backup files.
-     * @return integer
-     */
-    public 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
+	 */
+	public 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.
-     */
-    public 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.
+	 */
+	public 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);
+				}
+			}
     
-            // Rename fileName to fileName.1
-            $target = $fileName . ".1";
+			// Rename fileName to fileName.1
+			$target = $fileName . ".1";
     
-            $this->closeFile(); // keep windows happy.
+			$this->closeFile(); // keep windows happy.
     
-            $file = $fileName;
+			$file = $fileName;
 
-	    //As of now suppress the error in rename. we have to handle in future
-            @rename($file, $target);
-        }
+		//As of now suppress the error in rename. we have to handle in future
+			@rename($file, $target);
+		}
         
-        $this->setFile($fileName, false);
-        unset($this->fp);
-        $this->activateOptions();
-    }
+		$this->setFile($fileName, false);
+		unset($this->fp);
+		$this->activateOptions();
+	}
     
-    public function setFileName($fileName)
-    {
-        $this->fileName = $fileName;
-        $this->expandedFileName = realpath($fileName);
-        LoggerLog::debug("LoggerAppenderRollingFile::setFileName():filename=[{$fileName}]:expandedFileName=[{$this->expandedFileName}]");  
-    }
+	public function setFileName($fileName)
+	{
+		$this->fileName = $fileName;
+		$this->expandedFileName = realpath($fileName);
+		LoggerLog::debug("LoggerAppenderRollingFile::setFileName():filename=[{$fileName}]:expandedFileName=[{$this->expandedFileName}]");  
+	}
 
 
-    /**
-     * 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()
-     */
-    public function setMaximumFileSize($maxFileSize)
-    {
-        $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()
+	 */
+	public function setMaximumFileSize($maxFileSize)
+	{
+		$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
-     */
-    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
+	 */
+	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) {
-            LoggerLog::debug("LoggerAppenderRollingFile::setMaxFileSize():value=[$value] wrong declaration");
-        } else {
-            $this->maxFileSize = abs($maxFileSize);
-        }
-    }
+		if ($maxFileSize === null) {
+			LoggerLog::debug("LoggerAppenderRollingFile::setMaxFileSize():value=[$value] wrong declaration");
+		} else {
+			$this->maxFileSize = abs($maxFileSize);
+		}
+	}
 
-    /**
-     * @param LoggerLoggingEvent $event
-     */
-    public function append($event)
-    {
-        if ($this->fp) {
-            parent::append($event);
-            if (ftell($this->fp) > $this->getMaximumFileSize())    
-                $this->rollOver();
-        }
-    }
+	/**
+	 * @param LoggerLoggingEvent $event
+	 */
+	public function append($event)
+	{
+		if ($this->fp) {
+			parent::append($event);
+			if (ftell($this->fp) > $this->getMaximumFileSize())    
+				$this->rollOver();
+		}
+	}
 }
 ?>

Spacing +8 added lines, -8 removed lines

@@ -69,7 +69,7 @@ 
      *
      * @var integer 
      */
-    public $maxBackupIndex  = 1;
+    public $maxBackupIndex = 1;
     
     /**
      * @var string the filename expanded
@@ -123,7 +123,7 @@ 
     public function rollOver()
     {
         // If maxBackups <= 0, then there is no file renaming to be done.
-        if($this->maxBackupIndex > 0) {
+        if ($this->maxBackupIndex > 0) {
             $fileName = $this->getExpandedFileName();
             // Delete the oldest file, to keep Windows happy.
             $file = $fileName . '.' . $this->maxBackupIndex;
@@ -176,7 +176,7 @@ 
     public function setMaxBackupIndex($maxBackups)
     {
         if (is_numeric($maxBackups))
-            $this->maxBackupIndex = abs((int)$maxBackups);
+            $this->maxBackupIndex = abs((int) $maxBackups);
     }
 
     /**
@@ -206,16 +206,16 @@ 
     public function setMaxFileSize($value)
     {
         $maxFileSize = null;
-        $numpart = substr($value,0, strlen($value) -2);
+        $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;
+            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;
+                    $maxFileSize = (int) $value;
                 }
         }
         

libraries/log4php.debug/appenders/LoggerAppenderSocket.php

Indentation +206 added lines, -206 removed lines

@@ -43,243 +43,243 @@
  */ 
 class LoggerAppenderSocket extends LoggerAppenderSkeleton {
 
-    /**
-     * @var mixed socket connection resource
-     * @access private
-     */
-    public $sp = false;
+	/**
+	 * @var mixed socket connection resource
+	 * @access private
+	 */
+	public $sp = false;
     
-    /**
-     * Target host. On how to define remote hostaname see 
-     * {@link PHP_MANUAL#fsockopen}
-     * @var string 
-     */
-    public $remoteHost     = '';
+	/**
+	 * Target host. On how to define remote hostaname see 
+	 * {@link PHP_MANUAL#fsockopen}
+	 * @var string 
+	 */
+	public $remoteHost     = '';
     
-    /**
-     * @var integer the network port.
-     */
-    public $port           = LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_PORT;
+	/**
+	 * @var integer the network port.
+	 */
+	public $port           = LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_PORT;
     
-    /**
-     * @var boolean get event's location info.
-     */
-    public $locationInfo   = false;
+	/**
+	 * @var boolean get event's location info.
+	 */
+	public $locationInfo   = false;
     
-    /**
-     * @var integer connection timeout
-     */
-    public $timeout        = LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_TIMEOUT;
+	/**
+	 * @var integer connection timeout
+	 */
+	public $timeout        = LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_TIMEOUT;
     
-    /**
-     * @var boolean output events via {@link LoggerXmlLayout}
-     */
-    public $useXml         = false;
+	/**
+	 * @var boolean output events via {@link LoggerXmlLayout}
+	 */
+	public $useXml         = false;
     
-    /**
-     * @var boolean forward this option to {@link LoggerXmlLayout}. 
-     *              Ignored if {@link $useXml} is <i>false</i>.
-     */
-    public $log4jNamespace = false;
+	/**
+	 * @var boolean forward this option to {@link LoggerXmlLayout}. 
+	 *              Ignored if {@link $useXml} is <i>false</i>.
+	 */
+	public $log4jNamespace = false;
 
-    /**
-     * @var LoggerXmlLayout
-     * @access private
-     */
-    public $xmlLayout      = null;
+	/**
+	 * @var LoggerXmlLayout
+	 * @access private
+	 */
+	public $xmlLayout      = null;
     
-    /**
-     * @var boolean
-     * @access private
-     */
-    public $requiresLayout = false;
+	/**
+	 * @var boolean
+	 * @access private
+	 */
+	public $requiresLayout = false;
     
-    /**
-     * Constructor
-     *
-     * @param string $name appender name
-     */
-    public function LoggerAppenderSocket($name)
-    {
-        $this->LoggerAppenderSkeleton($name);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param string $name appender name
+	 */
+	public function LoggerAppenderSocket($name)
+	{
+		$this->LoggerAppenderSkeleton($name);
+	}
 
-    /**
-     * Create a socket connection using defined parameters
-     */
-    public function activateOptions()
-    {
-        LoggerLog::debug("LoggerAppenderSocket::activateOptions() creating a socket...");        
-        $errno = 0;
-        $errstr = '';
-        $this->sp = @fsockopen($this->getRemoteHost(), $this->getPort(), $errno, $errstr, $this->getTimeout());
-        if ($errno) {
-            LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket error [$errno] $errstr");
-            $this->closed = true;
-        } else {
-            LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket created [".$this->sp."]");
-            if ($this->getUseXml()) {
-                $this->xmlLayout = LoggerLayout::factory('LoggerXmlLayout');
-                if ($this->xmlLayout === null) {
-                    LoggerLog::debug("LoggerAppenderSocket::activateOptions() useXml is true but layout is null");
-                    $this->setUseXml(false);
-                } else {
-                    $this->xmlLayout->setLocationInfo($this->getLocationInfo());
-                    $this->xmlLayout->setLog4jNamespace($this->getLog4jNamespace());
-                    $this->xmlLayout->activateOptions();
-                }            
-            }
-            $this->closed = false;
-        }
-    }
+	/**
+	 * Create a socket connection using defined parameters
+	 */
+	public function activateOptions()
+	{
+		LoggerLog::debug("LoggerAppenderSocket::activateOptions() creating a socket...");        
+		$errno = 0;
+		$errstr = '';
+		$this->sp = @fsockopen($this->getRemoteHost(), $this->getPort(), $errno, $errstr, $this->getTimeout());
+		if ($errno) {
+			LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket error [$errno] $errstr");
+			$this->closed = true;
+		} else {
+			LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket created [".$this->sp."]");
+			if ($this->getUseXml()) {
+				$this->xmlLayout = LoggerLayout::factory('LoggerXmlLayout');
+				if ($this->xmlLayout === null) {
+					LoggerLog::debug("LoggerAppenderSocket::activateOptions() useXml is true but layout is null");
+					$this->setUseXml(false);
+				} else {
+					$this->xmlLayout->setLocationInfo($this->getLocationInfo());
+					$this->xmlLayout->setLog4jNamespace($this->getLog4jNamespace());
+					$this->xmlLayout->activateOptions();
+				}            
+			}
+			$this->closed = false;
+		}
+	}
     
-    public function close()
-    {
-        @fclose($this->sp);
-        $this->closed = true;
-    }
+	public function close()
+	{
+		@fclose($this->sp);
+		$this->closed = true;
+	}
 
-    /**
-     * @return string
-     */
-    public function getHostname()
-    {
-        return $this->getRemoteHost();
-    }
+	/**
+	 * @return string
+	 */
+	public function getHostname()
+	{
+		return $this->getRemoteHost();
+	}
     
-    /**
-     * @return boolean
-     */
-    public function getLocationInfo()
-    {
-        return $this->locationInfo;
-    } 
+	/**
+	 * @return boolean
+	 */
+	public function getLocationInfo()
+	{
+		return $this->locationInfo;
+	} 
      
-    /**
-     * @return boolean
-     */
-    public function getLog4jNamespace()
-    {
-        return $this->log4jNamespace;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function getLog4jNamespace()
+	{
+		return $this->log4jNamespace;
+	}
 
-    /**
-     * @return integer
-     */
-    public function getPort()
-    {
-        return $this->port;
-    }
+	/**
+	 * @return integer
+	 */
+	public function getPort()
+	{
+		return $this->port;
+	}
     
-    public function getRemoteHost()
-    {
-        return $this->remoteHost;
-    }
+	public function getRemoteHost()
+	{
+		return $this->remoteHost;
+	}
     
-    /**
-     * @return integer
-     */
-    public function getTimeout()
-    {
-        return $this->timeout;
-    }
+	/**
+	 * @return integer
+	 */
+	public function getTimeout()
+	{
+		return $this->timeout;
+	}
     
-    /**
-     * @var boolean
-     */
-    public function getUseXml()
-    {
-        return $this->useXml;
-    } 
+	/**
+	 * @var boolean
+	 */
+	public function getUseXml()
+	{
+		return $this->useXml;
+	} 
      
-    public function reset()
-    {
-        $this->close();
-        parent::reset();
-    }
+	public function reset()
+	{
+		$this->close();
+		parent::reset();
+	}
 
-    /**
-     * @param string
-     * @deprecated Please, use {@link setRemoteHost}
-     */
-    public function setHostname($hostname)
-    {
-        $this->setRemoteHost($hostname);
-    }
+	/**
+	 * @param string
+	 * @deprecated Please, use {@link setRemoteHost}
+	 */
+	public function setHostname($hostname)
+	{
+		$this->setRemoteHost($hostname);
+	}
     
-    /**
-     * @param mixed
-     */
-    public function setLocationInfo($flag)
-    {
-        $this->locationInfo = LoggerOptionConverter::toBoolean($flag, $this->getLocationInfo());
-    } 
+	/**
+	 * @param mixed
+	 */
+	public function setLocationInfo($flag)
+	{
+		$this->locationInfo = LoggerOptionConverter::toBoolean($flag, $this->getLocationInfo());
+	} 
 
-    /**
-     * @param mixed
-     */
-    public function setLog4jNamespace($flag)
-    {
-        $this->log4jNamespace = LoggerOptionConverter::toBoolean($flag, $this->getLog4jNamespace());
-    } 
+	/**
+	 * @param mixed
+	 */
+	public function setLog4jNamespace($flag)
+	{
+		$this->log4jNamespace = LoggerOptionConverter::toBoolean($flag, $this->getLog4jNamespace());
+	} 
             
-    /**
-     * @param integer
-     */
-    public function setPort($port)
-    {
-        $port = LoggerOptionConverter::toInt($port, 0);
-        if ($port > 0 && $port < 65535)
-            $this->port = $port;    
-    }
+	/**
+	 * @param integer
+	 */
+	public function setPort($port)
+	{
+		$port = LoggerOptionConverter::toInt($port, 0);
+		if ($port > 0 && $port < 65535)
+			$this->port = $port;    
+	}
     
-    /**
-     * @param string
-     */
-    public function setRemoteHost($hostname)
-    {
-        $this->remoteHost = $hostname;
-    }
+	/**
+	 * @param string
+	 */
+	public function setRemoteHost($hostname)
+	{
+		$this->remoteHost = $hostname;
+	}
     
-    /**
-     * @param integer
-     */
-    public function setTimeout($timeout)
-    {
-        $this->timeout = LoggerOptionConverter::toInt($timeout, $this->getTimeout());
-    }
+	/**
+	 * @param integer
+	 */
+	public function setTimeout($timeout)
+	{
+		$this->timeout = LoggerOptionConverter::toInt($timeout, $this->getTimeout());
+	}
     
-    /**
-     * @param mixed
-     */
-    public function setUseXml($flag)
-    {
-        $this->useXml = LoggerOptionConverter::toBoolean($flag, $this->getUseXml());
-    } 
+	/**
+	 * @param mixed
+	 */
+	public function setUseXml($flag)
+	{
+		$this->useXml = LoggerOptionConverter::toBoolean($flag, $this->getUseXml());
+	} 
  
-    /**
-     * @param LoggerLoggingEvent
-     */
-    public function append($event)
-    {
-        if ($this->sp) {
+	/**
+	 * @param LoggerLoggingEvent
+	 */
+	public function append($event)
+	{
+		if ($this->sp) {
         
-            LoggerLog::debug("LoggerAppenderSocket::append()");
+			LoggerLog::debug("LoggerAppenderSocket::append()");
             
-            if ($this->getLocationInfo())
-                $event->getLocationInfo();
+			if ($this->getLocationInfo())
+				$event->getLocationInfo();
         
-            if (!$this->getUseXml()) {
-                $sEvent = serialize($event);
-                @fwrite($this->sp, $sEvent, strlen($sEvent));
-            } else {
-                @fwrite($this->sp, $this->xmlLayout->format($event));
-            }            
+			if (!$this->getUseXml()) {
+				$sEvent = serialize($event);
+				@fwrite($this->sp, $sEvent, strlen($sEvent));
+			} else {
+				@fwrite($this->sp, $this->xmlLayout->format($event));
+			}            
 
-            // not sure about it...
-            @fflush ($this->sp);
-        } 
-    }
+			// not sure about it...
+			@fflush ($this->sp);
+		} 
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -22,8 +22,8 @@ 
  */
 if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
 
-define('LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_PORT',       4446);
-define('LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_TIMEOUT',    30);
+define('LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_PORT', 4446);
+define('LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_TIMEOUT', 30);
 
 require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
 require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
@@ -54,27 +54,27 @@ 
      * {@link PHP_MANUAL#fsockopen}
      * @var string 
      */
-    public $remoteHost     = '';
+    public $remoteHost = '';
     
     /**
      * @var integer the network port.
      */
-    public $port           = LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_PORT;
+    public $port = LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_PORT;
     
     /**
      * @var boolean get event's location info.
      */
-    public $locationInfo   = false;
+    public $locationInfo = false;
     
     /**
      * @var integer connection timeout
      */
-    public $timeout        = LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_TIMEOUT;
+    public $timeout = LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_TIMEOUT;
     
     /**
      * @var boolean output events via {@link LoggerXmlLayout}
      */
-    public $useXml         = false;
+    public $useXml = false;
     
     /**
      * @var boolean forward this option to {@link LoggerXmlLayout}. 
@@ -86,7 +86,7 @@ 
      * @var LoggerXmlLayout
      * @access private
      */
-    public $xmlLayout      = null;
+    public $xmlLayout = null;
     
     /**
      * @var boolean
@@ -117,7 +117,7 @@ 
             LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket error [$errno] $errstr");
             $this->closed = true;
         } else {
-            LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket created [".$this->sp."]");
+            LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket created [" . $this->sp . "]");
             if ($this->getUseXml()) {
                 $this->xmlLayout = LoggerLayout::factory('LoggerXmlLayout');
                 if ($this->xmlLayout === null) {
@@ -277,7 +277,7 @@ 
             }            
 
             // not sure about it...
-            @fflush ($this->sp);
+            @fflush($this->sp);
         } 
     }
 }

libraries/log4php.debug/appenders/LoggerAppenderDb.php

Indentation +149 added lines, -149 removed lines

@@ -42,167 +42,167 @@
  */
 class LoggerAppenderDb extends LoggerAppenderSkeleton {
 
-    /**
-     * Create the log table if it does not exists (optional).
-     * @var boolean
-     */
-    public $createTable = true;
-    
-    /**
-     * PEAR::Db Data source name. Read PEAR::Db for dsn syntax (mandatory).
-     * @var string
-     */
-    public $dsn;
-    
-    /**
-     * A {@link LoggerPatternLayout} string used to format a valid insert query (mandatory).
-     * @var string
-     */
-    public $sql;
-    
-    /**
-     * Table name to write events. Used only if {@link $createTable} is true.
-     * @var string
-     */    
-    public $table;
-    
-    /**
-     * @var object PEAR::Db instance
-     * @access private
-     */
-    public $db = null;
-    
-    /**
-     * @var boolean used to check if all conditions to append are true
-     * @access private
-     */
-    public $canAppend = true;
-    
-    /**    
-     * @access private
-     */
-    public $requiresLayout = false;
-    
-    /**
-     * Constructor.
-     *
-     * @param string $name appender name
-     */
-    public function LoggerAppenderDb($name)
-    {
-        $this->LoggerAppenderSkeleton($name);
-    }
+	/**
+	 * Create the log table if it does not exists (optional).
+	 * @var boolean
+	 */
+	public $createTable = true;
+    
+	/**
+	 * PEAR::Db Data source name. Read PEAR::Db for dsn syntax (mandatory).
+	 * @var string
+	 */
+	public $dsn;
+    
+	/**
+	 * A {@link LoggerPatternLayout} string used to format a valid insert query (mandatory).
+	 * @var string
+	 */
+	public $sql;
+    
+	/**
+	 * Table name to write events. Used only if {@link $createTable} is true.
+	 * @var string
+	 */    
+	public $table;
+    
+	/**
+	 * @var object PEAR::Db instance
+	 * @access private
+	 */
+	public $db = null;
+    
+	/**
+	 * @var boolean used to check if all conditions to append are true
+	 * @access private
+	 */
+	public $canAppend = true;
+    
+	/**    
+	 * @access private
+	 */
+	public $requiresLayout = false;
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name appender name
+	 */
+	public function LoggerAppenderDb($name)
+	{
+		$this->LoggerAppenderSkeleton($name);
+	}
 
-    /**
-     * Setup db connection.
-     * Based on defined options, this method connects to db defined in {@link $dsn}
-     * and creates a {@link $table} table if {@link $createTable} is true.
-     * @return boolean true if all ok.
-     */
-    public function activateOptions()
-    {
-        $this->db = DB::connect($this->dsn);
+	/**
+	 * Setup db connection.
+	 * Based on defined options, this method connects to db defined in {@link $dsn}
+	 * and creates a {@link $table} table if {@link $createTable} is true.
+	 * @return boolean true if all ok.
+	 */
+	public function activateOptions()
+	{
+		$this->db = DB::connect($this->dsn);
 
-        if (DB::isError($this->db)) {
-            LoggerLog::debug("LoggerAppenderDb::activateOptions() DB Connect Error [".$this->db->getMessage()."]");            
-            $this->db = null;
-            $this->closed = true;
-            $this->canAppend = false;
+		if (DB::isError($this->db)) {
+			LoggerLog::debug("LoggerAppenderDb::activateOptions() DB Connect Error [".$this->db->getMessage()."]");            
+			$this->db = null;
+			$this->closed = true;
+			$this->canAppend = false;
 
-        } else {
+		} else {
         
-            $this->layout = LoggerLayout::factory('LoggerPatternLayout');
-            $this->layout->setConversionPattern($this->getSql());
+			$this->layout = LoggerLayout::factory('LoggerPatternLayout');
+			$this->layout->setConversionPattern($this->getSql());
         
-            // test if log table exists
-            $tableInfo = $this->db->tableInfo($this->table, $mode = null);
-            if (DB::isError($tableInfo) && $this->getCreateTable()) {
-                $query = "CREATE TABLE {$this->table} (timestamp varchar(32),logger varchar(32),level varchar(32),message varchar(64),thread varchar(32),file varchar(64),line varchar(4) );";
+			// test if log table exists
+			$tableInfo = $this->db->tableInfo($this->table, $mode = null);
+			if (DB::isError($tableInfo) && $this->getCreateTable()) {
+				$query = "CREATE TABLE {$this->table} (timestamp varchar(32),logger varchar(32),level varchar(32),message varchar(64),thread varchar(32),file varchar(64),line varchar(4) );";
 
-                LoggerLog::debug("LoggerAppenderDb::activateOptions() creating table '{$this->table}'... using sql='$query'");
+				LoggerLog::debug("LoggerAppenderDb::activateOptions() creating table '{$this->table}'... using sql='$query'");
                          
-                $result = $this->db->query($query);
-                if (DB::isError($result)) {
-                    LoggerLog::debug("LoggerAppenderDb::activateOptions() error while creating '{$this->table}'. Error is ".$result->getMessage());
-                    $this->canAppend = false;
-                    return;
-                }
-            }
-            $this->canAppend = true;            
-        }
+				$result = $this->db->query($query);
+				if (DB::isError($result)) {
+					LoggerLog::debug("LoggerAppenderDb::activateOptions() error while creating '{$this->table}'. Error is ".$result->getMessage());
+					$this->canAppend = false;
+					return;
+				}
+			}
+			$this->canAppend = true;            
+		}
 
-    }
+	}
     
-    public function append($event)
-    {
-        if ($this->canAppend) {
+	public function append($event)
+	{
+		if ($this->canAppend) {
 
-            $query = $this->layout->format($event);
+			$query = $this->layout->format($event);
 
-            LoggerLog::debug("LoggerAppenderDb::append() query='$query'");
+			LoggerLog::debug("LoggerAppenderDb::append() query='$query'");
 
-            $this->db->query($query);
-        }
-    }
-    
-    public function close()
-    {
-        if ($this->db !== null)
-            $this->db->disconnect();
-        $this->closed = true;
-    }
-    
-    /**
-     * @return boolean
-     */
-    public function getCreateTable()
-    {
-        return $this->createTable;
-    }
-    
-    /**
-     * @return string the defined dsn
-     */
-    public function getDsn()
-    {
-        return $this->dsn;
-    }
-    
-    /**
-     * @return string the sql pattern string
-     */
-    public function getSql()
-    {
-        return $this->sql;
-    }
-    
-    /**
-     * @return string the table name to create
-     */
-    public function getTable()
-    {
-        return $this->table;
-    }
-    
-    public function setCreateTable($flag)
-    {
-        $this->createTable = LoggerOptionConverter::toBoolean($flag, true);
-    }
-    
-    public function setDsn($newDsn)
-    {
-        $this->dsn = $newDsn;
-    }
-    
-    public function setSql($sql)
-    {
-        $this->sql = $sql;    
-    }
-    
-    public function setTable($table)
-    {
-        $this->table = $table;
-    }
+			$this->db->query($query);
+		}
+	}
+    
+	public function close()
+	{
+		if ($this->db !== null)
+			$this->db->disconnect();
+		$this->closed = true;
+	}
+    
+	/**
+	 * @return boolean
+	 */
+	public function getCreateTable()
+	{
+		return $this->createTable;
+	}
+    
+	/**
+	 * @return string the defined dsn
+	 */
+	public function getDsn()
+	{
+		return $this->dsn;
+	}
+    
+	/**
+	 * @return string the sql pattern string
+	 */
+	public function getSql()
+	{
+		return $this->sql;
+	}
+    
+	/**
+	 * @return string the table name to create
+	 */
+	public function getTable()
+	{
+		return $this->table;
+	}
+    
+	public function setCreateTable($flag)
+	{
+		$this->createTable = LoggerOptionConverter::toBoolean($flag, true);
+	}
+    
+	public function setDsn($newDsn)
+	{
+		$this->dsn = $newDsn;
+	}
+    
+	public function setSql($sql)
+	{
+		$this->sql = $sql;    
+	}
+    
+	public function setTable($table)
+	{
+		$this->table = $table;
+	}
     
 }
 

libraries/log4php.debug/appenders/LoggerAppenderPhp.php

Indentation +36 added lines, -36 removed lines

@@ -41,45 +41,45 @@
  */ 
 class LoggerAppenderPhp extends LoggerAppenderSkeleton {
 
-    /**
-     * @access private
-     */
-    public $requiresLayout = false;
+	/**
+	 * @access private
+	 */
+	public $requiresLayout = false;
     
-    /**
-     * Constructor
-     *
-     * @param string $name appender name
-     */
-    public function LoggerAppenderPhp($name)
-    {
-        $this->LoggerAppenderSkeleton($name);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param string $name appender name
+	 */
+	public function LoggerAppenderPhp($name)
+	{
+		$this->LoggerAppenderSkeleton($name);
+	}
 
-    public function activateOptions()
-    {
-        $this->layout = LoggerLayout::factory('LoggerLayoutTTCC');
-        $this->closed = false;
-    }
+	public function activateOptions()
+	{
+		$this->layout = LoggerLayout::factory('LoggerLayoutTTCC');
+		$this->closed = false;
+	}
 
-    public function close() 
-    {
-        $this->closed = true;
-    }
+	public function close() 
+	{
+		$this->closed = true;
+	}
 
-    public function append($event)
-    {
-        if ($this->layout !== null) {
-            LoggerLog::debug("LoggerAppenderPhp::append()");
-            $level = $event->getLevel();
-            if ($level->isGreaterOrEqual(LoggerLevel::getLevelError())) {
-                trigger_error($this->layout->format($event), E_USER_ERROR);
-            } elseif ($level->isGreaterOrEqual(LoggerLevel::getLevelWarn())) {
-                trigger_error($this->layout->format($event), E_USER_WARNING);
-            } else {
-                trigger_error($this->layout->format($event), E_USER_NOTICE);
-            }
-        }
-    }
+	public function append($event)
+	{
+		if ($this->layout !== null) {
+			LoggerLog::debug("LoggerAppenderPhp::append()");
+			$level = $event->getLevel();
+			if ($level->isGreaterOrEqual(LoggerLevel::getLevelError())) {
+				trigger_error($this->layout->format($event), E_USER_ERROR);
+			} elseif ($level->isGreaterOrEqual(LoggerLevel::getLevelWarn())) {
+				trigger_error($this->layout->format($event), E_USER_WARNING);
+			} else {
+				trigger_error($this->layout->format($event), E_USER_NOTICE);
+			}
+		}
+	}
 }
 ?>
\ No newline at end of file