chamilo / chamilo-lms

main/inc/lib/pear/Text/Password.php

Doc Comments +10 added lines

@@ -180,6 +180,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _xor($login, $key)
@@ -208,6 +209,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _rotx($login, $key)
@@ -241,6 +243,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _rotxpp($login, $key)
@@ -274,6 +277,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _rotxmm($login, $key)
@@ -306,6 +310,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _asciiRotx($login, $key)
@@ -340,6 +345,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _asciiRotxpp($login, $key)
@@ -374,6 +380,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _asciiRotxmm($login, $key)
@@ -430,6 +437,7 @@ 
      *
      * @access private
      * @param  integer Length of the password
+     * @param integer $length
      * @return string  Returns the password
      */
     function _createPronounceable($length)
@@ -475,6 +483,8 @@ 
      * @param  string  Character which could be use in the
      *                 unpronounceable password ex : 'ABCDEFG'
      *                 or numeric, alphabetical or alphanumeric.
+     * @param integer $length
+     * @param string $chars
      * @return string  Returns the password
      */
     function _createUnpronounceable($length, $chars)

Indentation +37 added lines, -37 removed lines

@@ -441,17 +441,17 @@ 
          * List of vowels and vowel sounds
          */
         $v = array('a', 'e', 'i', 'o', 'u', 'ae', 'ou', 'io',
-                   'ea', 'ou', 'ia', 'ai'
-                   );
+                    'ea', 'ou', 'ia', 'ai'
+                    );
 
         /**
          * List of consonants and consonant sounds
          */
         $c = array('b', 'c', 'd', 'g', 'h', 'j', 'k', 'l', 'm',
-                   'n', 'p', 'r', 's', 't', 'u', 'v', 'w',
-                   'tr', 'cr', 'fr', 'dr', 'wr', 'pr', 'th',
-                   'ch', 'ph', 'st', 'sl', 'cl'
-                   );
+                    'n', 'p', 'r', 's', 't', 'u', 'v', 'w',
+                    'tr', 'cr', 'fr', 'dr', 'wr', 'pr', 'th',
+                    'ch', 'ph', 'st', 'sl', 'cl'
+                    );
 
         $v_count = 12;
         $c_count = 29;
@@ -484,50 +484,50 @@ 
         /**
          * List of character which could be use in the password
          */
-         switch($chars) {
+            switch($chars) {
 
-         case 'alphanumeric':
+            case 'alphanumeric':
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
+                break;
 
-         case 'alphabetical':
+            case 'alphabetical':
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
+                break;
 
-         case 'numeric':
+            case 'numeric':
              $chars = '0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
+                break;
 
-         case '':
+            case '':
              $chars = '_#@%&ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
+                break;
 
-         default:
+            default:
              /**
               * Some characters shouldn't be used
               */
              $chars = trim($chars);
-             $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
-
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
-         }
-
-         /**
-          * Generate password
-          */
-         for ($i = 0; $i < $length; $i++) {
-             $num = mt_rand(0, $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] - 1);
-             $password .= $chars{$num};
-         }
-
-         /**
-          * Return password
-          */
-         return $password;
+                $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
+
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
+            }
+
+            /**
+             * Generate password
+             */
+            for ($i = 0; $i < $length; $i++) {
+                $num = mt_rand(0, $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] - 1);
+                $password .= $chars{$num};
+            }
+
+            /**
+             * Return password
+             */
+            return $password;
     }
 }
 ?>

Switch Indentation +61 added lines, -61 removed lines

@@ -55,12 +55,12 @@ 
     function create($length = 10, $type = 'pronounceable', $chars = '')
     {
         switch ($type) {
-        case 'unpronounceable' :
-            return Text_Password::_createUnpronounceable($length, $chars);
+            case 'unpronounceable' :
+                return Text_Password::_createUnpronounceable($length, $chars);
 
-        case 'pronounceable' :
-        default :
-            return Text_Password::_createPronounceable($length);
+            case 'pronounceable' :
+            default :
+                return Text_Password::_createPronounceable($length);
         }
     }
 
@@ -110,35 +110,35 @@ 
     function createFromLogin($login, $type, $key = 0)
     {
         switch ($type) {
-        case 'reverse':
-            return strrev($login);
+            case 'reverse':
+                return strrev($login);
 
-        case 'shuffle':
-            return Text_Password::_shuffle($login);
+            case 'shuffle':
+                return Text_Password::_shuffle($login);
 
-        case 'xor':
-            return Text_Password::_xor($login, $key);
+            case 'xor':
+                return Text_Password::_xor($login, $key);
 
-        case 'rot13':
-            return str_rot13($login);
+            case 'rot13':
+                return str_rot13($login);
 
-        case 'rotx':
-            return Text_Password::_rotx($login, $key);
+            case 'rotx':
+                return Text_Password::_rotx($login, $key);
 
-        case 'rotx++':
-            return Text_Password::_rotxpp($login, $key);
+            case 'rotx++':
+                return Text_Password::_rotxpp($login, $key);
 
-        case 'rotx--':
-            return Text_Password::_rotxmm($login, $key);
+            case 'rotx--':
+                return Text_Password::_rotxmm($login, $key);
 
-        case 'ascii_rotx':
-            return Text_Password::_asciiRotx($login, $key);
+            case 'ascii_rotx':
+                return Text_Password::_asciiRotx($login, $key);
 
-        case 'ascii_rotx++':
-            return Text_Password::_asciiRotxpp($login, $key);
+            case 'ascii_rotx++':
+                return Text_Password::_asciiRotxpp($login, $key);
 
-        case 'ascii_rotx--':
-            return Text_Password::_asciiRotxmm($login, $key);
+            case 'ascii_rotx--':
+                return Text_Password::_asciiRotxmm($login, $key);
         }
     }
 
@@ -320,11 +320,11 @@ 
                 $next += 255;
             }
             switch ($next) { // delete white space
-            case 0x09:
-            case 0x20:
-            case 0x0A:
-            case 0x0D:
-                $next++;
+                case 0x09:
+                case 0x20:
+                case 0x0A:
+                case 0x0D:
+                    $next++;
             }
             $tmp .= chr($next);
         }
@@ -354,11 +354,11 @@ 
                 $next += 255;
             }
             switch ($next) { // delete white space
-            case 0x09:
-            case 0x20:
-            case 0x0A:
-            case 0x0D:
-                $next++;
+                case 0x09:
+                case 0x20:
+                case 0x0A:
+                case 0x0D:
+                    $next++;
             }
             $tmp .= chr($next);
         }
@@ -388,11 +388,11 @@ 
                 $next += 255;
             }
             switch ($next) { // delete white space
-            case 0x09:
-            case 0x20:
-            case 0x0A:
-            case 0x0D:
-                $next++;
+                case 0x09:
+                case 0x20:
+                case 0x0A:
+                case 0x0D:
+                    $next++;
             }
             $tmp .= chr($next);
         }
@@ -486,34 +486,34 @@ 
          */
          switch($chars) {
 
-         case 'alphanumeric':
-             $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
-             break;
+             case 'alphanumeric':
+                 $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
+                 break;
 
-         case 'alphabetical':
-             $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
-             break;
+             case 'alphabetical':
+                 $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
+                 break;
 
-         case 'numeric':
-             $chars = '0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
-             break;
+             case 'numeric':
+                 $chars = '0123456789';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
+                 break;
 
-         case '':
-             $chars = '_#@%&ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
-             break;
+             case '':
+                 $chars = '_#@%&ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
+                 break;
 
-         default:
-             /**
+             default:
+                 /**
               * Some characters shouldn't be used
               */
-             $chars = trim($chars);
-             $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
+                 $chars = trim($chars);
+                 $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
 
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
          }
 
          /**

Spacing +2 added lines, -2 removed lines

@@ -459,7 +459,7 @@ 
         $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = $v_count + $c_count;
 
         for ($i = 0; $i < $length; $i++) {
-            $retVal .= $c[mt_rand(0, $c_count-1)] . $v[mt_rand(0, $v_count-1)];
+            $retVal .= $c[mt_rand(0, $c_count - 1)].$v[mt_rand(0, $v_count - 1)];
         }
 
         return substr($retVal, 0, $length);
@@ -484,7 +484,7 @@ 
         /**
          * List of character which could be use in the password
          */
-         switch($chars) {
+         switch ($chars) {
 
          case 'alphanumeric':
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';

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

Doc Comments +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
      * 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.
+     * @return boolean|null true if all ok.
      */
     function activateOptions()
     {        

Indentation +4 added lines, -4 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
  */
 
 /** A docblok to make phpdoc happy */
-require_once(ADODB_DIR . '/adodb.inc.php');
+require_once(ADODB_DIR.'/adodb.inc.php');
 
 /**
  * Appends log events to a db table using adodb class.
@@ -120,7 +120,7 @@ 
     function activateOptions()
     {        
         $this->db = &ADONewConnection($this->type);
-        if (! $this->db->PConnect($this->host, $this->user, $this->password, $this->database)) {
+        if (!$this->db->PConnect($this->host, $this->user, $this->password, $this->database)) {
           $this->db = null;
           $this->closed = true;
           $this->canAppend = false;
@@ -131,14 +131,14 @@ 
         $this->layout->setConversionPattern($this->getSql());
     
         // test if log table exists
-        $sql = 'select * from ' . $this->table . ' where 1 = 0';
+        $sql = 'select * from '.$this->table.' where 1 = 0';
         $dbrs = $this->db->Execute($sql);
         if ($dbrs == false and $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) );";
 
                      
             $result = $this->db->Execute($query);
-            if (! $result) {
+            if (!$result) {
                 $this->canAppend = false;
                 return;
             }

Braces +3 added lines, -2 removed lines

@@ -155,8 +155,9 @@
     
     function close()
     {
-        if ($this->db !== null)
-            $this->db->Close();
+        if ($this->db !== null) {
+                    $this->db->Close();
+        }
         $this->closed = true;
     }
     

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

Doc Comments +6 added lines

@@ -151,10 +151,16 @@
 		return $this->append;
 	}
 
+	/**
+	 * @param boolean $flag
+	 */
 	public function setAppend($flag) {
 		$this->append = LoggerOptionConverter::toBoolean($flag, true);		  
 	}
 
+	/**
+	 * @param string $fileName
+	 */
 	public function setFileName($fileName) {
 		$this->fileName = $fileName;
 	}

Spacing +14 added lines, -14 removed lines

@@ -67,17 +67,17 @@ 
 	public function activateOptions() {
 		$fileName = $this->getFile();
 
-		if(!is_file($fileName)) {
+		if (!is_file($fileName)) {
 			$dir = dirname($fileName);
-			if(!is_dir($dir)) {
+			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()) {
+		$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());
@@ -93,9 +93,9 @@ 
 	}
 	
 	public function close() {
-		if($this->closed != true) {
-			if($this->fp and $this->layout !== null) {
-				if(flock($this->fp, LOCK_EX)) {
+		if ($this->closed != true) {
+			if ($this->fp and $this->layout !== null) {
+				if (flock($this->fp, LOCK_EX)) {
 					fwrite($this->fp, $this->layout->getFooter());
 					flock($this->fp, LOCK_UN);
 				}
@@ -106,8 +106,8 @@ 
 	}
 
 	public function append(LoggerLoggingEvent $event) {
-		if($this->fp and $this->layout !== null) {
-			if(flock($this->fp, LOCK_EX)) {
+		if ($this->fp and $this->layout !== null) {
+			if (flock($this->fp, LOCK_EX)) {
 				fwrite($this->fp, $this->layout->format($event));
 				flock($this->fp, LOCK_UN);
 			} else {
@@ -127,11 +127,11 @@ 
 	 */
 	public function setFile() {
 		$numargs = func_num_args();
-		$args	 = func_get_args();
+		$args = func_get_args();
 
-		if($numargs == 1 and is_string($args[0])) {
+		if ($numargs == 1 and is_string($args[0])) {
 			$this->setFileName($args[0]);
-		} else if ($numargs >=2 and is_string($args[0]) and is_bool($args[1])) {
+		} else if ($numargs >= 2 and is_string($args[0]) and is_bool($args[1])) {
 			$this->setFile($args[0]);
 			$this->setAppend($args[1]);
 		}

Indentation +109 added lines, -109 removed lines

@@ -42,129 +42,129 @@
  */
 class LoggerAppenderFile extends LoggerAppender {
 
-	/**
-	 * @var boolean if {@link $file} exists, appends events.
-	 */
-	private $append = true;
-	/**
-	 * @var string the file name used to append events
-	 */
-	protected $fileName;
-	/**
-	 * @var mixed file resource
-	 */
-	protected $fp = false;
+    /**
+     * @var boolean if {@link $file} exists, appends events.
+     */
+    private $append = true;
+    /**
+     * @var string the file name used to append events
+     */
+    protected $fileName;
+    /**
+     * @var mixed file resource
+     */
+    protected $fp = false;
 	
-	public function __construct($name = '') {
-		parent::__construct($name);
-		$this->requiresLayout = true;
-	}
+    public function __construct($name = '') {
+        parent::__construct($name);
+        $this->requiresLayout = true;
+    }
 
-	public function __destruct() {
-       $this->close();
-   	}
+    public function __destruct() {
+        $this->close();
+        }
    	
-	public function activateOptions() {
-		$fileName = $this->getFile();
+    public function activateOptions() {
+        $fileName = $this->getFile();
 
-		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;
+        }
+    }
 	
-	public function close() {
-		if($this->closed != true) {
-			if($this->fp and $this->layout !== null) {
-				if(flock($this->fp, LOCK_EX)) {
-					fwrite($this->fp, $this->layout->getFooter());
-					flock($this->fp, LOCK_UN);
-				}
-				fclose($this->fp);
-			}
-			$this->closed = true;
-		}
-	}
+    public function close() {
+        if($this->closed != true) {
+            if($this->fp and $this->layout !== null) {
+                if(flock($this->fp, LOCK_EX)) {
+                    fwrite($this->fp, $this->layout->getFooter());
+                    flock($this->fp, LOCK_UN);
+                }
+                fclose($this->fp);
+            }
+            $this->closed = true;
+        }
+    }
 
-	public function append(LoggerLoggingEvent $event) {
-		if($this->fp and $this->layout !== null) {
-			if(flock($this->fp, LOCK_EX)) {
-				fwrite($this->fp, $this->layout->format($event));
-				flock($this->fp, LOCK_UN);
-			} else {
-				$this->closed = true;
-			}
-		} 
-	}
+    public function append(LoggerLoggingEvent $event) {
+        if($this->fp and $this->layout !== null) {
+            if(flock($this->fp, LOCK_EX)) {
+                fwrite($this->fp, $this->layout->format($event));
+                flock($this->fp, LOCK_UN);
+            } else {
+                $this->closed = 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.
-	 * 
-	 * TODO: remove overloading. Use only file as alias to filename
-	 */
-	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.
+     * 
+     * TODO: remove overloading. Use only file as alias to filename
+     */
+    public function setFile() {
+        $numargs = func_num_args();
+        $args	 = func_get_args();
 
-		if($numargs == 1 and is_string($args[0])) {
-			$this->setFileName($args[0]);
-		} else if ($numargs >=2 and is_string($args[0]) and is_bool($args[1])) {
-			$this->setFile($args[0]);
-			$this->setAppend($args[1]);
-		}
-	}
+        if($numargs == 1 and is_string($args[0])) {
+            $this->setFileName($args[0]);
+        } else if ($numargs >=2 and is_string($args[0]) and is_bool($args[1])) {
+            $this->setFile($args[0]);
+            $this->setAppend($args[1]);
+        }
+    }
 	
-	/**
-	 * @return string
-	 */
-	public function getFile() {
-		return $this->getFileName();
-	}
+    /**
+     * @return string
+     */
+    public function getFile() {
+        return $this->getFileName();
+    }
 	
-	/**
-	 * @return boolean
-	 */
-	public function getAppend() {
-		return $this->append;
-	}
+    /**
+     * @return boolean
+     */
+    public function getAppend() {
+        return $this->append;
+    }
 
-	public function setAppend($flag) {
-		$this->append = LoggerOptionConverter::toBoolean($flag, true);		  
-	}
+    public function setAppend($flag) {
+        $this->append = LoggerOptionConverter::toBoolean($flag, true);		  
+    }
 
-	public function setFileName($fileName) {
-		$this->fileName = $fileName;
-	}
+    public function setFileName($fileName) {
+        $this->fileName = $fileName;
+    }
 	
-	/**
-	 * @return string
-	 */
-	public function getFileName() {
-		return $this->fileName;
-	}
+    /**
+     * @return string
+     */
+    public function getFileName() {
+        return $this->fileName;
+    }
 	
 	 
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
    	
 	/**
 	 * Returns the value of the MaxBackupIndex option.
-	 * @return integer 
+	 * @return string 
 	 */
 	private function getExpandedFileName() {
 		return $this->expandedFileName;

Indentation +162 added lines, -162 removed lines

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

Spacing +20 added lines, -20 removed lines

@@ -78,7 +78,7 @@ 
 	 *
 	 * @var integer 
 	 */
-	private $maxBackupIndex	 = 1;
+	private $maxBackupIndex = 1;
 	
 	/**
 	 * @var string the filename expanded
@@ -117,17 +117,17 @@ 
 	 */
 	private 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;
-			if(is_writable($file))
+			$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);
+			for ($i = $this->maxBackupIndex - 1; $i >= 1; $i--) {
+				$file = $fileName.".".$i;
+				if (is_readable($file)) {
+					$target = $fileName.'.'.($i + 1);
 					rename($file, $target);
 				}
 			}
@@ -135,7 +135,7 @@ 
 			$this->close();
 	
 			// Rename fileName to fileName.1
-			$target = $fileName . ".1";
+			$target = $fileName.".1";
 			$file = $fileName;
 			rename($file, $target);
 		}
@@ -167,8 +167,8 @@ 
 	 * @param mixed $maxBackups
 	 */
 	public function setMaxBackupIndex($maxBackups) {
-		if(is_numeric($maxBackups)) {
-			$this->maxBackupIndex = abs((int)$maxBackups);
+		if (is_numeric($maxBackups)) {
+			$this->maxBackupIndex = abs((int) $maxBackups);
 		}
 	}
 
@@ -199,20 +199,20 @@ 
 	 */
 	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;
+		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 (is_numeric($value)) {
+					$maxFileSize = (int) $value;
 				}
 		}
 		
-		if($maxFileSize !== null) {
+		if ($maxFileSize !== null) {
 			$this->maxFileSize = abs($maxFileSize);
 		}
 		return $this->maxFileSize;
@@ -223,7 +223,7 @@ 
 	 */
 	public function append(LoggerLoggingEvent $event) {
 		parent::append($event);
-		if(ftell($this->fp) > $this->getMaximumFileSize()) {
+		if (ftell($this->fp) > $this->getMaximumFileSize()) {
 			$this->rollOver();
 		}
 	}

Braces +6 added lines, -3 removed lines

@@ -121,8 +121,9 @@ 
 			$fileName = $this->getExpandedFileName();
 			// Delete the oldest file, to keep Windows happy.
 			$file = $fileName . '.' . $this->maxBackupIndex;
-			if(is_writable($file))
-				unlink($file);
+			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;
@@ -150,7 +151,9 @@ 
 		// As LoggerAppenderFile does not create the directory, it has to exist.
 		// realpath() fails if the argument does not exist so the filename is separated.
 		$this->expandedFileName = realpath(dirname($fileName));
-		if ($this->expandedFileName === false) throw new Exception("Directory of $fileName does not exist!");
+		if ($this->expandedFileName === false) {
+		    throw new Exception("Directory of $fileName does not exist!");
+		}
 		$this->expandedFileName .= '/'.basename($fileName);
 	}
 

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

Doc Comments +1 added lines

@@ -225,6 +225,7 @@
 	
 	/**
 	 * @param mixed
+	 * @param boolean $flag
 	 */
 	public function setUseXml($flag) {
 		$this->useXml = LoggerOptionConverter::toBoolean($flag, $this->getUseXml());

Indentation +181 added lines, -181 removed lines

@@ -46,215 +46,215 @@
  */ 
 class LoggerAppenderSocket extends LoggerAppender {
 
-	/**
-	 * @var mixed socket connection resource
-	 * @access private
-	 */
-	private $sp = false;
+    /**
+     * @var mixed socket connection resource
+     * @access private
+     */
+    private $sp = false;
 	
-	/**
-	 * Target host. On how to define remote hostaname see 
-	 * {@link PHP_MANUAL#fsockopen}
-	 * @var string 
-	 */
-	private $remoteHost = '';
+    /**
+     * Target host. On how to define remote hostaname see 
+     * {@link PHP_MANUAL#fsockopen}
+     * @var string 
+     */
+    private $remoteHost = '';
 	
-	/**
-	 * @var integer the network port.
-	 */
-	private $port = 4446;
+    /**
+     * @var integer the network port.
+     */
+    private $port = 4446;
 	
-	/**
-	 * @var boolean get event's location info.
-	 */
-	private $locationInfo = false;
+    /**
+     * @var boolean get event's location info.
+     */
+    private $locationInfo = false;
 	
-	/**
-	 * @var integer connection timeout
-	 */
-	private $timeout = 30;
+    /**
+     * @var integer connection timeout
+     */
+    private $timeout = 30;
 	
-	/**
-	 * @var boolean output events via {@link LoggerXmlLayout}
-	 */
-	private $useXml = false;
+    /**
+     * @var boolean output events via {@link LoggerXmlLayout}
+     */
+    private $useXml = false;
 	
-	/**
-	 * @var boolean forward this option to {@link LoggerXmlLayout}. 
-	 *				Ignored if {@link $useXml} is <i>false</i>.
-	 */
-	private $log4jNamespace = false;
+    /**
+     * @var boolean forward this option to {@link LoggerXmlLayout}. 
+     *				Ignored if {@link $useXml} is <i>false</i>.
+     */
+    private $log4jNamespace = false;
 
-	/**
-	 * @var LoggerXmlLayout
-	 * @access private
-	 */
-	private $xmlLayout = null;
+    /**
+     * @var LoggerXmlLayout
+     * @access private
+     */
+    private $xmlLayout = null;
 	
-	/** @var indiciates if this appender should run in dry mode */
-	private $dry = false;
+    /** @var indiciates if this appender should run in dry mode */
+    private $dry = false;
 	
-	public function __destruct() {
-       $this->close();
-   	}
+    public function __destruct() {
+        $this->close();
+        }
    	
-	/**
-	 * Create a socket connection using defined parameters
-	 */
-	public function activateOptions() {
-		if(!$this->dry) {
-			$this->sp = @fsockopen($this->getRemoteHost(), $this->getPort(), $errno, $errstr, $this->getTimeout());
-			if ($this->sp === false) {
-			    throw new LoggerException("Could not open socket to ".$this->getRemoteHost().":".$this->getPort().": $errstr ($errno)");
-			}
-		}
-		if($this->getUseXml()) {
-			$this->xmlLayout = LoggerReflectionUtils::createObject('LoggerLayoutXml');
-			if($this->xmlLayout === null) {
-				$this->setUseXml(false);
-			} else {
-				$this->xmlLayout->setLocationInfo($this->getLocationInfo());
-				$this->xmlLayout->setLog4jNamespace($this->getLog4jNamespace());
-				$this->xmlLayout->activateOptions();
-			}			 
-		}
+    /**
+     * Create a socket connection using defined parameters
+     */
+    public function activateOptions() {
+        if(!$this->dry) {
+            $this->sp = @fsockopen($this->getRemoteHost(), $this->getPort(), $errno, $errstr, $this->getTimeout());
+            if ($this->sp === false) {
+                throw new LoggerException("Could not open socket to ".$this->getRemoteHost().":".$this->getPort().": $errstr ($errno)");
+            }
+        }
+        if($this->getUseXml()) {
+            $this->xmlLayout = LoggerReflectionUtils::createObject('LoggerLayoutXml');
+            if($this->xmlLayout === null) {
+                $this->setUseXml(false);
+            } else {
+                $this->xmlLayout->setLocationInfo($this->getLocationInfo());
+                $this->xmlLayout->setLog4jNamespace($this->getLog4jNamespace());
+                $this->xmlLayout->activateOptions();
+            }			 
+        }
         $this->closed = false;
-	}
+    }
 	
-	public function close() {
-		if($this->closed != true) {
-			if(!$this->dry and $this->sp !== false) {
-				fclose($this->sp);
-			}
-			$this->closed = true;
-		}
-	}
+    public function close() {
+        if($this->closed != true) {
+            if(!$this->dry and $this->sp !== false) {
+                fclose($this->sp);
+            }
+            $this->closed = true;
+        }
+    }
 
-	public function setDry($dry) {
-		$this->dry = $dry;
-	}
+    public function setDry($dry) {
+        $this->dry = $dry;
+    }
 	
-	/**
-	 * @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 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 and $port < 65535) {
-			$this->port = $port;	
-		}
-	}
+    /**
+     * @param integer
+     */
+    public function setPort($port) {
+        $port = LoggerOptionConverter::toInt($port, 0);
+        if($port > 0 and $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());
+    } 
  
-	public function append(LoggerLoggingEvent $event) {
-		if($this->sp || $this->dry) {
-			if($this->getLocationInfo()) {
-				$event->getLocationInformation();
-			}
+    public function append(LoggerLoggingEvent $event) {
+        if($this->sp || $this->dry) {
+            if($this->getLocationInfo()) {
+                $event->getLocationInformation();
+            }
 		
-			if(!$this->getUseXml()) {
-				$sEvent = serialize($event);
-				if(!$this->dry) {
-					fwrite($this->sp, $sEvent, strlen($sEvent));
-				} else {
-				    echo "DRY MODE OF SOCKET APPENDER: ".$sEvent;
-				}
-			} else {
-				if(!$this->dry) {
-					fwrite($this->sp, $this->xmlLayout->format($event));
-				} else {
-				    echo "DRY MODE OF SOCKET APPENDER: ".$this->xmlLayout->format($event);
-				}
-			}			 
+            if(!$this->getUseXml()) {
+                $sEvent = serialize($event);
+                if(!$this->dry) {
+                    fwrite($this->sp, $sEvent, strlen($sEvent));
+                } else {
+                    echo "DRY MODE OF SOCKET APPENDER: ".$sEvent;
+                }
+            } else {
+                if(!$this->dry) {
+                    fwrite($this->sp, $this->xmlLayout->format($event));
+                } else {
+                    echo "DRY MODE OF SOCKET APPENDER: ".$this->xmlLayout->format($event);
+                }
+            }			 
 
-			// not sure about it...
-			if(!$this->dry) {
-				fflush($this->sp);
-			}
-		} 
-	}
+            // not sure about it...
+            if(!$this->dry) {
+                fflush($this->sp);
+            }
+        } 
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -102,15 +102,15 @@ 
 	 * Create a socket connection using defined parameters
 	 */
 	public function activateOptions() {
-		if(!$this->dry) {
+		if (!$this->dry) {
 			$this->sp = @fsockopen($this->getRemoteHost(), $this->getPort(), $errno, $errstr, $this->getTimeout());
 			if ($this->sp === false) {
 			    throw new LoggerException("Could not open socket to ".$this->getRemoteHost().":".$this->getPort().": $errstr ($errno)");
 			}
 		}
-		if($this->getUseXml()) {
+		if ($this->getUseXml()) {
 			$this->xmlLayout = LoggerReflectionUtils::createObject('LoggerLayoutXml');
-			if($this->xmlLayout === null) {
+			if ($this->xmlLayout === null) {
 				$this->setUseXml(false);
 			} else {
 				$this->xmlLayout->setLocationInfo($this->getLocationInfo());
@@ -122,8 +122,8 @@ 
 	}
 	
 	public function close() {
-		if($this->closed != true) {
-			if(!$this->dry and $this->sp !== false) {
+		if ($this->closed != true) {
+			if (!$this->dry and $this->sp !== false) {
 				fclose($this->sp);
 			}
 			$this->closed = true;
@@ -204,7 +204,7 @@ 
 	 */
 	public function setPort($port) {
 		$port = LoggerOptionConverter::toInt($port, 0);
-		if($port > 0 and $port < 65535) {
+		if ($port > 0 and $port < 65535) {
 			$this->port = $port;	
 		}
 	}
@@ -231,20 +231,20 @@ 
 	} 
  
 	public function append(LoggerLoggingEvent $event) {
-		if($this->sp || $this->dry) {
-			if($this->getLocationInfo()) {
+		if ($this->sp || $this->dry) {
+			if ($this->getLocationInfo()) {
 				$event->getLocationInformation();
 			}
 		
-			if(!$this->getUseXml()) {
+			if (!$this->getUseXml()) {
 				$sEvent = serialize($event);
-				if(!$this->dry) {
+				if (!$this->dry) {
 					fwrite($this->sp, $sEvent, strlen($sEvent));
 				} else {
 				    echo "DRY MODE OF SOCKET APPENDER: ".$sEvent;
 				}
 			} else {
-				if(!$this->dry) {
+				if (!$this->dry) {
 					fwrite($this->sp, $this->xmlLayout->format($event));
 				} else {
 				    echo "DRY MODE OF SOCKET APPENDER: ".$this->xmlLayout->format($event);
@@ -252,7 +252,7 @@ 
 			}			 
 
 			// not sure about it...
-			if(!$this->dry) {
+			if (!$this->dry) {
 				fflush($this->sp);
 			}
 		} 

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

Doc Comments -1 removed lines

@@ -279,7 +279,6 @@
 	 * 
 	 * @param string $url The name of the configuration file where the
 	 *					  configuration information is stored.
-	 * @param LoggerHierarchy $repository the repository to apply the configuration
 	 */
 	public function configure(LoggerHierarchy $hierarchy, $url = '') {
 		$properties = @parse_ini_file($url);

Spacing +26 added lines, -26 removed lines

@@ -313,16 +313,16 @@ 
 		$effectivePrefix = self::ROOT_LOGGER_PREFIX;
 		$value = @$props[self::ROOT_LOGGER_PREFIX];
 
-		if(empty($value)) {
+		if (empty($value)) {
 			$value = @$props[self::ROOT_CATEGORY_PREFIX];
 			$effectivePrefix = self::ROOT_CATEGORY_PREFIX;
 		}
 
-		if(empty($value)) {
+		if (empty($value)) {
 			// TODO "Could not find root logger information. Is this OK?"
 		} else {
 			$root = $hierarchy->getRootLogger();
-			$this->parseCategory($props, $root, $effectivePrefix, self::INTERNAL_ROOT_NAME,	$value);
+			$this->parseCategory($props, $root, $effectivePrefix, self::INTERNAL_ROOT_NAME, $value);
 		}
 	}
 
@@ -333,19 +333,19 @@ 
 	 * @param LoggerHierarchy $hierarchy
 	 */
 	private function parseCatsAndRenderers($props, LoggerHierarchy $hierarchy) {
-		while(list($key,$value) = each($props)) {
-			if(strpos($key, self::CATEGORY_PREFIX) === 0 or 
+		while (list($key, $value) = each($props)) {
+			if (strpos($key, self::CATEGORY_PREFIX) === 0 or 
 				strpos($key, self::LOGGER_PREFIX) === 0) {
-				if(strpos($key, self::CATEGORY_PREFIX) === 0) {
+				if (strpos($key, self::CATEGORY_PREFIX) === 0) {
 					$loggerName = substr($key, strlen(self::CATEGORY_PREFIX));
-				} else if(strpos($key, self::LOGGER_PREFIX) === 0) {
+				} else if (strpos($key, self::LOGGER_PREFIX) === 0) {
 					$loggerName = substr($key, strlen(self::LOGGER_PREFIX));
 				}
 				
 				$logger = $hierarchy->getLogger($loggerName);
 				$this->parseCategory($props, $logger, $key, $loggerName, $value);
 				$this->parseAdditivityForLogger($props, $logger, $loggerName);
-			} else if(strpos($key, self::RENDERER_PREFIX) === 0) {
+			} else if (strpos($key, self::RENDERER_PREFIX) === 0) {
 				$renderedClass = substr($key, strlen(self::RENDERER_PREFIX));
 				$renderingClass = $value;
 				$hierarchy->getRendererMap()->addRenderer($renderedClass, $renderingClass);
@@ -361,10 +361,10 @@ 
 	 * @param string $loggerName
 	 */
 	private function parseAdditivityForLogger($props, Logger $cat, $loggerName) {
-		$value = LoggerOptionConverter::findAndSubst(self::ADDITIVITY_PREFIX . $loggerName, $props);
+		$value = LoggerOptionConverter::findAndSubst(self::ADDITIVITY_PREFIX.$loggerName, $props);
 		
 		// touch additivity only if necessary
-		if(!empty($value)) {
+		if (!empty($value)) {
 			$additivity = LoggerOptionConverter::toBoolean($value, true);
 			$cat->setAdditivity($additivity);
 		}
@@ -387,9 +387,9 @@ 
 		// If value is not in the form ", appender.." or "", then we should set
 		// the level of the loggeregory.
 
-		if(!(empty($value) || @$value[0] == ',')) {
+		if (!(empty($value) || @$value[0] == ',')) {
 			// just to be on the safe side...
-			if(count($st) == 0) {
+			if (count($st) == 0) {
 				return;
 			}
 			$levelStr = current($st);
@@ -397,8 +397,8 @@ 
 			// If the level value is inherited, set category level value to
 			// null. We also check that the user has not specified inherited for the
 			// root category.
-			if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) {
-				if($loggerName == self::INTERNAL_ROOT_NAME) {
+			if ('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) {
+				if ($loggerName == self::INTERNAL_ROOT_NAME) {
 					// TODO: throw exception?	"The root logger cannot be set to null."
 				} else {
 					$logger->setLevel(null);
@@ -410,14 +410,14 @@ 
 
 		// TODO: removing should be done by the logger, if necessary and wanted 
 		// $logger->removeAllAppenders();
-		while($appenderName = next($st)) {
+		while ($appenderName = next($st)) {
 			$appenderName = trim($appenderName);
-			if(empty($appenderName)) {
+			if (empty($appenderName)) {
 				continue;
 			}
 			
 			$appender = $this->parseAppender($props, $appenderName);
-			if($appender !== null) {
+			if ($appender !== null) {
 					$logger->addAppender($appender);
 			}
 		}
@@ -430,34 +430,34 @@ 
 	 */
 	private function parseAppender($props, $appenderName) {
 		$appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
-		$prefix = self::APPENDER_PREFIX . $appenderName;
-		if($appender === null) {
+		$prefix = self::APPENDER_PREFIX.$appenderName;
+		if ($appender === null) {
 			// Appender was not previously initialized.
 			$appenderClass = @$props[$prefix];
 			$appender = LoggerAppenderPool::getAppenderFromPool($appenderName, $appenderClass);
-			if($appender === null) {
+			if ($appender === null) {
 				return null;
 			}
 		}
 		
-		if($appender->requiresLayout() ) {
-			$layoutPrefix = $prefix . ".layout";
+		if ($appender->requiresLayout()) {
+			$layoutPrefix = $prefix.".layout";
 			$layoutClass = @$props[$layoutPrefix];
 			$layoutClass = LoggerOptionConverter::substVars($layoutClass, $props);
-			if(empty($layoutClass)) {
+			if (empty($layoutClass)) {
 				$layout = LoggerReflectionUtils::createObject('LoggerLayoutSimple');
 			} else {
 				$layout = LoggerReflectionUtils::createObject($layoutClass);
-				if($layout === null) {
+				if ($layout === null) {
 					$layout = LoggerReflectionUtils::createObject('LoggerLayoutSimple');
 				}
 			}
 			
-			LoggerReflectionUtils::setPropertiesByObject($layout, $props, $layoutPrefix . ".");				  
+			LoggerReflectionUtils::setPropertiesByObject($layout, $props, $layoutPrefix.".");				  
 			$appender->setLayout($layout);
 			
 		}
-		LoggerReflectionUtils::setPropertiesByObject($appender, $props, $prefix . ".");
+		LoggerReflectionUtils::setPropertiesByObject($appender, $props, $prefix.".");
 		return $appender;		 
 	}
 }

Indentation +376 added lines, -376 removed lines

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

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

Doc Comments +3 added lines

@@ -237,6 +237,9 @@
 		return $this->head;
 	}
 
+	/**
+	 * @param string $c
+	 */
 	public function finalizeConverter($c) {
 		$pc = null;
 		switch($c) {

Switch Indentation +13 added lines, -13 removed lines

@@ -186,19 +186,19 @@
 				case self::CONVERTER_STATE:
 						$this->currentLiteral .= $c;
 						switch($c) {
-						case '-':
-							$this->formattingInfo->leftAlign = true;
-							break;
-						case '.':
-							$this->state = self::DOT_STATE;
-								break;
-						default:
-							if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-								$this->formattingInfo->min = ord($c) - ord('0');
-								$this->state = self::MIN_STATE;
-							} else {
-								$this->finalizeConverter($c);
-							}
+						    case '-':
+							    $this->formattingInfo->leftAlign = true;
+							    break;
+						    case '.':
+							    $this->state = self::DOT_STATE;
+								    break;
+						    default:
+							    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+								    $this->formattingInfo->min = ord($c) - ord('0');
+								    $this->state = self::MIN_STATE;
+							    } else {
+								    $this->finalizeConverter($c);
+							    }
 						} // switch
 					break;
 				case self::MIN_STATE:

Spacing +31 added lines, -31 removed lines

@@ -90,7 +90,7 @@ 
 	 */
 	public function __construct($pattern) {
 		$this->pattern = $pattern;
-		$this->patternLength =	strlen($pattern);
+		$this->patternLength = strlen($pattern);
 		$this->formattingInfo = new LoggerFormattingInfo();
 		$this->state = self::LITERAL_STATE;
 	}
@@ -99,7 +99,7 @@ 
 	 * @param LoggerPatternConverter $pc
 	 */
 	public function addToList($pc) {
-		if($this->head == null) {
+		if ($this->head == null) {
 			$this->head = $pc;
 			$this->tail = $this->head;
 		} else {
@@ -112,11 +112,11 @@ 
 	 * @return string
 	 */
 	public function extractOption() {
-		if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) {
-			$end = strpos($this->pattern, '}' , $this->i);
-			if($end !== false) {
+		if (($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) {
+			$end = strpos($this->pattern, '}', $this->i);
+			if ($end !== false) {
 				$r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1));
-				$this->i= $end + 1;
+				$this->i = $end + 1;
 				return $r;
 			}
 		}
@@ -130,10 +130,10 @@ 
 	public function extractPrecisionOption() {
 		$opt = $this->extractOption();
 		$r = 0;
-		if($opt !== null) {
-			if(is_numeric($opt)) {
-				$r = (int)$opt;
-				if($r <= 0) {
+		if ($opt !== null) {
+			if (is_numeric($opt)) {
+				$r = (int) $opt;
+				if ($r <= 0) {
 					$r = 0;
 				}
 			}
@@ -150,19 +150,19 @@ 
 		$c = '';
 		$this->i = 0;
 		$this->currentLiteral = '';
-		while($this->i < $this->patternLength) {
+		while ($this->i < $this->patternLength) {
 			$c = $this->pattern{$this->i++};
 
-			switch($this->state) {
+			switch ($this->state) {
 				case self::LITERAL_STATE:
 					// In literal state, the last char is always a literal.
-					if($this->i == $this->patternLength) {
+					if ($this->i == $this->patternLength) {
 						$this->currentLiteral .= $c;
 						continue;
 					}
-					if($c == self::ESCAPE_CHAR) {
+					if ($c == self::ESCAPE_CHAR) {
 						// peek at the next char.
-						switch($this->pattern{$this->i}) {
+						switch ($this->pattern{$this->i}) {
 							case self::ESCAPE_CHAR:
 								$this->currentLiteral .= $c;
 								$this->i++; // move pointer
@@ -172,7 +172,7 @@ 
 								$this->i++; // move pointer
 								break;
 							default:
-								if(strlen($this->currentLiteral) != 0) {
+								if (strlen($this->currentLiteral) != 0) {
 									$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
 								}
 								$this->currentLiteral = $c;
@@ -185,7 +185,7 @@ 
 					break;
 				case self::CONVERTER_STATE:
 						$this->currentLiteral .= $c;
-						switch($c) {
+						switch ($c) {
 						case '-':
 							$this->formattingInfo->leftAlign = true;
 							break;
@@ -193,7 +193,7 @@ 
 							$this->state = self::DOT_STATE;
 								break;
 						default:
-							if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+							if (ord($c) >= ord('0') and ord($c) <= ord('9')) {
 								$this->formattingInfo->min = ord($c) - ord('0');
 								$this->state = self::MIN_STATE;
 							} else {
@@ -203,7 +203,7 @@ 
 					break;
 				case self::MIN_STATE:
 					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+					if (ord($c) >= ord('0') and ord($c) <= ord('9')) {
 						$this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord($c) - ord('0'));
 					} else if ($c == '.') {
 						$this->state = self::DOT_STATE;
@@ -213,7 +213,7 @@ 
 					break;
 				case self::DOT_STATE:
 					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+					if (ord($c) >= ord('0') and ord($c) <= ord('9')) {
 						$this->formattingInfo->max = ord($c) - ord('0');
 						$this->state = self::MAX_STATE;
 					} else {
@@ -222,7 +222,7 @@ 
 					break;
 				case self::MAX_STATE:
 					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+					if (ord($c) >= ord('0') and ord($c) <= ord('9')) {
 						$this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
 					} else {
 						$this->finalizeConverter($c);
@@ -231,7 +231,7 @@ 
 					break;
 			} // switch
 		} // while
-		if(strlen($this->currentLiteral) != 0) {
+		if (strlen($this->currentLiteral) != 0) {
 			$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
 		}
 		return $this->head;
@@ -239,7 +239,7 @@ 
 
 	public function finalizeConverter($c) {
 		$pc = null;
-		switch($c) {
+		switch ($c) {
 			case 'c':
 				$pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
 				$this->currentLiteral = '';
@@ -252,18 +252,18 @@ 
 				$dateFormatStr = self::DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
 				$dOpt = $this->extractOption();
 
-				if($dOpt !== null)
+				if ($dOpt !== null)
 					$dateFormatStr = $dOpt;
 					
-				if($dateFormatStr == 'ISO8601') {
+				if ($dateFormatStr == 'ISO8601') {
 					$df = self::DATE_FORMAT_ISO8601;
-				} else if($dateFormatStr == 'ABSOLUTE') {
+				} else if ($dateFormatStr == 'ABSOLUTE') {
 					$df = self::DATE_FORMAT_ABSOLUTE;
-				} else if($dateFormatStr == 'DATE') {
+				} else if ($dateFormatStr == 'DATE') {
 					$df = self::DATE_FORMAT_DATE;
 				} else {
 					$df = $dateFormatStr;
-					if($df == null) {
+					if ($df == null) {
 						$df = self::DATE_FORMAT_ISO8601;
 					}
 				}
@@ -303,10 +303,10 @@ 
 				$this->currentLiteral = '';
 				break;
 			case 'u':
-				if($this->i < $this->patternLength) {
+				if ($this->i < $this->patternLength) {
 					$cNext = $this->pattern{$this->i};
-					if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
-						$pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
+					if (ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
+						$pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string) (ord($cNext) - ord('0')));
 						$this->currentLiteral = '';
 						$this->i++;
 					}

Braces +3 added lines, -2 removed lines

@@ -252,8 +252,9 @@
 				$dateFormatStr = self::DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
 				$dOpt = $this->extractOption();
 
-				if($dOpt !== null)
-					$dateFormatStr = $dOpt;
+				if($dOpt !== null) {
+									$dateFormatStr = $dOpt;
+				}
 					
 				if($dateFormatStr == 'ISO8601') {
 					$df = self::DATE_FORMAT_ISO8601;

Indentation +284 added lines, -284 removed lines

@@ -33,309 +33,309 @@
  */
 class LoggerPatternParser {
 
-	const ESCAPE_CHAR = '%';
+    const ESCAPE_CHAR = '%';
 	
-	const LITERAL_STATE = 0;
-	const CONVERTER_STATE = 1;
-	const MINUS_STATE = 2;
-	const DOT_STATE = 3;
-	const MIN_STATE = 4;
-	const MAX_STATE = 5;
+    const LITERAL_STATE = 0;
+    const CONVERTER_STATE = 1;
+    const MINUS_STATE = 2;
+    const DOT_STATE = 3;
+    const MIN_STATE = 4;
+    const MAX_STATE = 5;
 	
-	const FULL_LOCATION_CONVERTER = 1000;
-	const METHOD_LOCATION_CONVERTER = 1001;
-	const CLASS_LOCATION_CONVERTER = 1002;
-	const FILE_LOCATION_CONVERTER = 1003;
-	const LINE_LOCATION_CONVERTER = 1004;
+    const FULL_LOCATION_CONVERTER = 1000;
+    const METHOD_LOCATION_CONVERTER = 1001;
+    const CLASS_LOCATION_CONVERTER = 1002;
+    const FILE_LOCATION_CONVERTER = 1003;
+    const LINE_LOCATION_CONVERTER = 1004;
 	
-	const RELATIVE_TIME_CONVERTER = 2000;
-	const THREAD_CONVERTER = 2001;
-	const LEVEL_CONVERTER = 2002;
-	const NDC_CONVERTER = 2003;
-	const MESSAGE_CONVERTER = 2004;
+    const RELATIVE_TIME_CONVERTER = 2000;
+    const THREAD_CONVERTER = 2001;
+    const LEVEL_CONVERTER = 2002;
+    const NDC_CONVERTER = 2003;
+    const MESSAGE_CONVERTER = 2004;
 	
-	const DATE_FORMAT_ISO8601 = 'Y-m-d H:i:s,u'; 
-	const DATE_FORMAT_ABSOLUTE = 'H:i:s';
-	const DATE_FORMAT_DATE = 'd M Y H:i:s,u';
+    const DATE_FORMAT_ISO8601 = 'Y-m-d H:i:s,u'; 
+    const DATE_FORMAT_ABSOLUTE = 'H:i:s';
+    const DATE_FORMAT_DATE = 'd M Y H:i:s,u';
 
-	private $state;
-	private $currentLiteral;
-	private $patternLength;
-	private $i;
+    private $state;
+    private $currentLiteral;
+    private $patternLength;
+    private $i;
 	
-	/**
-	 * @var LoggerPatternConverter
-	 */
-	private $head = null;
+    /**
+     * @var LoggerPatternConverter
+     */
+    private $head = null;
 	 
-	/**
-	 * @var LoggerPatternConverter
-	 */
-	private $tail = null;
+    /**
+     * @var LoggerPatternConverter
+     */
+    private $tail = null;
 	
-	/**
-	 * @var LoggerFormattingInfo
-	 */
-	private $formattingInfo;
+    /**
+     * @var LoggerFormattingInfo
+     */
+    private $formattingInfo;
 	
-	/**
-	 * @var string pattern to parse
-	 */
-	private $pattern;
+    /**
+     * @var string pattern to parse
+     */
+    private $pattern;
 
-	/**
-	 * Constructor 
-	 *
-	 * @param string $pattern
-	 */
-	public function __construct($pattern) {
-		$this->pattern = $pattern;
-		$this->patternLength =	strlen($pattern);
-		$this->formattingInfo = new LoggerFormattingInfo();
-		$this->state = self::LITERAL_STATE;
-	}
+    /**
+     * Constructor 
+     *
+     * @param string $pattern
+     */
+    public function __construct($pattern) {
+        $this->pattern = $pattern;
+        $this->patternLength =	strlen($pattern);
+        $this->formattingInfo = new LoggerFormattingInfo();
+        $this->state = self::LITERAL_STATE;
+    }
 
-	/**
-	 * @param LoggerPatternConverter $pc
-	 */
-	public function addToList($pc) {
-		if($this->head == null) {
-			$this->head = $pc;
-			$this->tail = $this->head;
-		} else {
-			$this->tail->next = $pc;
-			$this->tail = $this->tail->next;
-		}
-	}
+    /**
+     * @param LoggerPatternConverter $pc
+     */
+    public function addToList($pc) {
+        if($this->head == null) {
+            $this->head = $pc;
+            $this->tail = $this->head;
+        } else {
+            $this->tail->next = $pc;
+            $this->tail = $this->tail->next;
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	public function extractOption() {
-		if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) {
-			$end = strpos($this->pattern, '}' , $this->i);
-			if($end !== false) {
-				$r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1));
-				$this->i= $end + 1;
-				return $r;
-			}
-		}
-		return null;
-	}
+    /**
+     * @return string
+     */
+    public function extractOption() {
+        if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) {
+            $end = strpos($this->pattern, '}' , $this->i);
+            if($end !== false) {
+                $r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1));
+                $this->i= $end + 1;
+                return $r;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * The option is expected to be in decimal and positive. In case of
-	 * error, zero is returned.	 
-	 */
-	public function extractPrecisionOption() {
-		$opt = $this->extractOption();
-		$r = 0;
-		if($opt !== null) {
-			if(is_numeric($opt)) {
-				$r = (int)$opt;
-				if($r <= 0) {
-					$r = 0;
-				}
-			}
-		}
-		return $r;
-	}
+    /**
+     * The option is expected to be in decimal and positive. In case of
+     * error, zero is returned.	 
+     */
+    public function extractPrecisionOption() {
+        $opt = $this->extractOption();
+        $r = 0;
+        if($opt !== null) {
+            if(is_numeric($opt)) {
+                $r = (int)$opt;
+                if($r <= 0) {
+                    $r = 0;
+                }
+            }
+        }
+        return $r;
+    }
 
 	
-	/** Parser.
-	 * 
-	 * @return LoggerPatternConverter Returns $this->head.
-	 */
-	public function parse() {
-		$c = '';
-		$this->i = 0;
-		$this->currentLiteral = '';
-		while($this->i < $this->patternLength) {
-			$c = $this->pattern{$this->i++};
+    /** Parser.
+     * 
+     * @return LoggerPatternConverter Returns $this->head.
+     */
+    public function parse() {
+        $c = '';
+        $this->i = 0;
+        $this->currentLiteral = '';
+        while($this->i < $this->patternLength) {
+            $c = $this->pattern{$this->i++};
 
-			switch($this->state) {
-				case self::LITERAL_STATE:
-					// In literal state, the last char is always a literal.
-					if($this->i == $this->patternLength) {
-						$this->currentLiteral .= $c;
-						continue;
-					}
-					if($c == self::ESCAPE_CHAR) {
-						// peek at the next char.
-						switch($this->pattern{$this->i}) {
-							case self::ESCAPE_CHAR:
-								$this->currentLiteral .= $c;
-								$this->i++; // move pointer
-								break;
-							case 'n':
-								$this->currentLiteral .= PHP_EOL;
-								$this->i++; // move pointer
-								break;
-							default:
-								if(strlen($this->currentLiteral) != 0) {
-									$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
-								}
-								$this->currentLiteral = $c;
-								$this->state = self::CONVERTER_STATE;
-								$this->formattingInfo->reset();
-						}
-					} else {
-						$this->currentLiteral .= $c;
-					}
-					break;
-				case self::CONVERTER_STATE:
-						$this->currentLiteral .= $c;
-						switch($c) {
-						case '-':
-							$this->formattingInfo->leftAlign = true;
-							break;
-						case '.':
-							$this->state = self::DOT_STATE;
-								break;
-						default:
-							if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-								$this->formattingInfo->min = ord($c) - ord('0');
-								$this->state = self::MIN_STATE;
-							} else {
-								$this->finalizeConverter($c);
-							}
-						} // switch
-					break;
-				case self::MIN_STATE:
-					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-						$this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord($c) - ord('0'));
-					} else if ($c == '.') {
-						$this->state = self::DOT_STATE;
-					} else {
-						$this->finalizeConverter($c);
-					}
-					break;
-				case self::DOT_STATE:
-					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-						$this->formattingInfo->max = ord($c) - ord('0');
-						$this->state = self::MAX_STATE;
-					} else {
-						$this->state = self::LITERAL_STATE;
-					}
-					break;
-				case self::MAX_STATE:
-					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-						$this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
-					} else {
-						$this->finalizeConverter($c);
-						$this->state = self::LITERAL_STATE;
-					}
-					break;
-			} // switch
-		} // while
-		if(strlen($this->currentLiteral) != 0) {
-			$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
-		}
-		return $this->head;
-	}
+            switch($this->state) {
+                case self::LITERAL_STATE:
+                    // In literal state, the last char is always a literal.
+                    if($this->i == $this->patternLength) {
+                        $this->currentLiteral .= $c;
+                        continue;
+                    }
+                    if($c == self::ESCAPE_CHAR) {
+                        // peek at the next char.
+                        switch($this->pattern{$this->i}) {
+                            case self::ESCAPE_CHAR:
+                                $this->currentLiteral .= $c;
+                                $this->i++; // move pointer
+                                break;
+                            case 'n':
+                                $this->currentLiteral .= PHP_EOL;
+                                $this->i++; // move pointer
+                                break;
+                            default:
+                                if(strlen($this->currentLiteral) != 0) {
+                                    $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
+                                }
+                                $this->currentLiteral = $c;
+                                $this->state = self::CONVERTER_STATE;
+                                $this->formattingInfo->reset();
+                        }
+                    } else {
+                        $this->currentLiteral .= $c;
+                    }
+                    break;
+                case self::CONVERTER_STATE:
+                        $this->currentLiteral .= $c;
+                        switch($c) {
+                        case '-':
+                            $this->formattingInfo->leftAlign = true;
+                            break;
+                        case '.':
+                            $this->state = self::DOT_STATE;
+                                break;
+                        default:
+                            if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                                $this->formattingInfo->min = ord($c) - ord('0');
+                                $this->state = self::MIN_STATE;
+                            } else {
+                                $this->finalizeConverter($c);
+                            }
+                        } // switch
+                    break;
+                case self::MIN_STATE:
+                    $this->currentLiteral .= $c;
+                    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                        $this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord($c) - ord('0'));
+                    } else if ($c == '.') {
+                        $this->state = self::DOT_STATE;
+                    } else {
+                        $this->finalizeConverter($c);
+                    }
+                    break;
+                case self::DOT_STATE:
+                    $this->currentLiteral .= $c;
+                    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                        $this->formattingInfo->max = ord($c) - ord('0');
+                        $this->state = self::MAX_STATE;
+                    } else {
+                        $this->state = self::LITERAL_STATE;
+                    }
+                    break;
+                case self::MAX_STATE:
+                    $this->currentLiteral .= $c;
+                    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                        $this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
+                    } else {
+                        $this->finalizeConverter($c);
+                        $this->state = self::LITERAL_STATE;
+                    }
+                    break;
+            } // switch
+        } // while
+        if(strlen($this->currentLiteral) != 0) {
+            $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
+        }
+        return $this->head;
+    }
 
-	public function finalizeConverter($c) {
-		$pc = null;
-		switch($c) {
-			case 'c':
-				$pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
-				$this->currentLiteral = '';
-				break;
-			case 'C':
-				$pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption());
-				$this->currentLiteral = '';
-				break;
-			case 'd':
-				$dateFormatStr = self::DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
-				$dOpt = $this->extractOption();
+    public function finalizeConverter($c) {
+        $pc = null;
+        switch($c) {
+            case 'c':
+                $pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
+                $this->currentLiteral = '';
+                break;
+            case 'C':
+                $pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption());
+                $this->currentLiteral = '';
+                break;
+            case 'd':
+                $dateFormatStr = self::DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
+                $dOpt = $this->extractOption();
 
-				if($dOpt !== null)
-					$dateFormatStr = $dOpt;
+                if($dOpt !== null)
+                    $dateFormatStr = $dOpt;
 					
-				if($dateFormatStr == 'ISO8601') {
-					$df = self::DATE_FORMAT_ISO8601;
-				} else if($dateFormatStr == 'ABSOLUTE') {
-					$df = self::DATE_FORMAT_ABSOLUTE;
-				} else if($dateFormatStr == 'DATE') {
-					$df = self::DATE_FORMAT_DATE;
-				} else {
-					$df = $dateFormatStr;
-					if($df == null) {
-						$df = self::DATE_FORMAT_ISO8601;
-					}
-				}
-				$pc = new LoggerDatePatternConverter($this->formattingInfo, $df);
-				$this->currentLiteral = '';
-				break;
-			case 'F':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FILE_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'l':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FULL_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'L':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::LINE_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'm':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::MESSAGE_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'M':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::METHOD_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'p':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::LEVEL_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'r':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::RELATIVE_TIME_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 't':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::THREAD_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'u':
-				if($this->i < $this->patternLength) {
-					$cNext = $this->pattern{$this->i};
-					if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
-						$pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
-						$this->currentLiteral = '';
-						$this->i++;
-					}
-				}
-				break;
-			case 'x':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::NDC_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'X':
-				$xOpt = $this->extractOption();
-				$pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt);
-				$this->currentLiteral = '';
-				break;
-			default:
-				$pc = new LoggerLiteralPatternConverter($this->currentLiteral);
-				$this->currentLiteral = '';
-		}
-		$this->addConverter($pc);
-	}
+                if($dateFormatStr == 'ISO8601') {
+                    $df = self::DATE_FORMAT_ISO8601;
+                } else if($dateFormatStr == 'ABSOLUTE') {
+                    $df = self::DATE_FORMAT_ABSOLUTE;
+                } else if($dateFormatStr == 'DATE') {
+                    $df = self::DATE_FORMAT_DATE;
+                } else {
+                    $df = $dateFormatStr;
+                    if($df == null) {
+                        $df = self::DATE_FORMAT_ISO8601;
+                    }
+                }
+                $pc = new LoggerDatePatternConverter($this->formattingInfo, $df);
+                $this->currentLiteral = '';
+                break;
+            case 'F':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FILE_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'l':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FULL_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'L':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::LINE_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'm':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::MESSAGE_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'M':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::METHOD_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'p':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::LEVEL_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'r':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::RELATIVE_TIME_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 't':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::THREAD_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'u':
+                if($this->i < $this->patternLength) {
+                    $cNext = $this->pattern{$this->i};
+                    if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
+                        $pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
+                        $this->currentLiteral = '';
+                        $this->i++;
+                    }
+                }
+                break;
+            case 'x':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::NDC_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'X':
+                $xOpt = $this->extractOption();
+                $pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt);
+                $this->currentLiteral = '';
+                break;
+            default:
+                $pc = new LoggerLiteralPatternConverter($this->currentLiteral);
+                $this->currentLiteral = '';
+        }
+        $this->addConverter($pc);
+    }
 
-	public function addConverter($pc) {
-		$this->currentLiteral = '';
-		// Add the pattern converter to the list.
-		$this->addToList($pc);
-		// Next pattern is assumed to be a literal.
-		$this->state = self::LITERAL_STATE;
-		// Reset formatting info
-		$this->formattingInfo->reset();
-	}
+    public function addConverter($pc) {
+        $this->currentLiteral = '';
+        // Add the pattern converter to the list.
+        $this->addToList($pc);
+        // Next pattern is assumed to be a literal.
+        $this->state = self::LITERAL_STATE;
+        // Reset formatting info
+        $this->formattingInfo->reset();
+    }
 }
 

main/inc/lib/phpdocx/lib/log4php/layouts/LoggerLayoutPattern.php

Doc Comments +1 added lines

@@ -169,6 +169,7 @@
 	 * Set the <b>ConversionPattern</b> option. This is the string which
 	 * controls formatting and consists of a mix of literal content and
 	 * conversion specifiers.
+	 * @param string $conversionPattern
 	 */
 	public function setConversionPattern($conversionPattern) {
 		$this->pattern = $conversionPattern;

Spacing +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
         $results = array();
         $c = $this->head;
         while ($c !== null) {
-            if ( ! $c instanceOf LoggerLiteralPatternConverter) {
+            if (!$c instanceOf LoggerLiteralPatternConverter) {
                 $sbuf = null;
                 $c->format($sbuf, $event);
                 $results[] = $sbuf;

Indentation +48 added lines, -48 removed lines

@@ -136,61 +136,61 @@
  * @since 0.3 
  */
 class LoggerLayoutPattern extends LoggerLayout {
-	/** Default conversion Pattern */
-	const DEFAULT_CONVERSION_PATTERN = '%m%n';
+    /** Default conversion Pattern */
+    const DEFAULT_CONVERSION_PATTERN = '%m%n';
 
-	/** Default conversion TTCC Pattern */
-	const TTCC_CONVERSION_PATTERN = '%r [%t] %p %c %x - %m%n';
+    /** Default conversion TTCC Pattern */
+    const TTCC_CONVERSION_PATTERN = '%r [%t] %p %c %x - %m%n';
 
-	/** The pattern. 
-	 * @var string */
-	private $pattern;
+    /** The pattern. 
+     * @var string */
+    private $pattern;
 
-	/** Head of a chain of Converters.
-	 * @var LoggerPatternConverter */
-	private $head;
+    /** Head of a chain of Converters.
+     * @var LoggerPatternConverter */
+    private $head;
 
-	private $timezone;
+    private $timezone;
 
-	/**
-	 * Constructs a PatternLayout using the 
-	 * {@link DEFAULT_LAYOUT_PATTERN}.
-	 * The default pattern just produces the application supplied message.
-	 */
-	public function __construct($pattern = null) {
-		if ($pattern === null) {
-			$this->pattern = self :: DEFAULT_CONVERSION_PATTERN;
-		} else {
-			$this->pattern = $pattern;
-		}
-	}
+    /**
+     * Constructs a PatternLayout using the 
+     * {@link DEFAULT_LAYOUT_PATTERN}.
+     * The default pattern just produces the application supplied message.
+     */
+    public function __construct($pattern = null) {
+        if ($pattern === null) {
+            $this->pattern = self :: DEFAULT_CONVERSION_PATTERN;
+        } else {
+            $this->pattern = $pattern;
+        }
+    }
 
-	/**
-	 * Set the <b>ConversionPattern</b> option. This is the string which
-	 * controls formatting and consists of a mix of literal content and
-	 * conversion specifiers.
-	 */
-	public function setConversionPattern($conversionPattern) {
-		$this->pattern = $conversionPattern;
-		$patternParser = new LoggerPatternParser($this->pattern);
-		$this->head = $patternParser->parse();
-	}
+    /**
+     * Set the <b>ConversionPattern</b> option. This is the string which
+     * controls formatting and consists of a mix of literal content and
+     * conversion specifiers.
+     */
+    public function setConversionPattern($conversionPattern) {
+        $this->pattern = $conversionPattern;
+        $patternParser = new LoggerPatternParser($this->pattern);
+        $this->head = $patternParser->parse();
+    }
 
-	/**
-	 * Produces a formatted string as specified by the conversion pattern.
-	 *
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function format(LoggerLoggingEvent $event) {
-		$sbuf = '';
-		$c = $this->head;
-		while ($c !== null) {
-			$c->format($sbuf, $event);
-			$c = $c->next;
-		}
-		return $sbuf;
-	}
+    /**
+     * Produces a formatted string as specified by the conversion pattern.
+     *
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function format(LoggerLoggingEvent $event) {
+        $sbuf = '';
+        $c = $this->head;
+        while ($c !== null) {
+            $c->format($sbuf, $event);
+            $c = $c->next;
+        }
+        return $sbuf;
+    }
 	
     /**
      * Returns an array with the formatted elements.

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

Doc Comments +9 added lines, -6 removed lines

@@ -240,7 +240,7 @@ 
 	/**
 	 * Log a message object with the ERROR level including the caller.
 	 *
-	 * @param mixed $message message
+	 * @param string $message message
 	 * @param mixed $caller caller object or caller string id
 	 */
 	public function error($message, $caller = null) {
@@ -286,6 +286,7 @@ 
 	 * Check whether this category is enabled for a given Level passed as parameter.
 	 *
 	 * @param LoggerLevel level
+	 * @param LoggerLevel $level
 	 * @return boolean
 	 */
 	public function isEnabledFor($level) {
@@ -326,6 +327,9 @@ 
 		}
 	}
 	 
+	/**
+	 * @param LoggerLevel $level
+	 */
 	private function logLevel($message, $level, $caller = null) {
 		if($level->isGreaterOrEqual($this->getEffectiveLevel())) {
 			$this->forcedLog($this->fqcn, $caller, $level, $message);
@@ -338,7 +342,6 @@ 
 	 * Get a Logger by name (Delegate to {@link Logger})
 	 * 
 	 * @param string $name logger name
-	 * @param LoggerFactory $factory a {@link LoggerFactory} instance or null
 	 * @return Logger
 	 * @static 
 	 */
@@ -474,7 +477,7 @@ 
 	 * Clears all logger definitions
 	 * 
 	 * @static
-	 * @return boolean 
+	 * @return boolean|null 
 	 */
 	public static function clear() {
 		return self::getHierarchy()->clear();	 
@@ -484,7 +487,7 @@ 
 	 * Destroy configurations for logger definitions
 	 * 
 	 * @static
-	 * @return boolean 
+	 * @return boolean|null 
 	 */
 	public static function resetConfiguration() {
 		$result = self::getHierarchy()->resetConfiguration();
@@ -592,7 +595,7 @@ 
 	
 	/**
 	 * Returns the current configurator
-	 * @return the configurator
+	 * @return string configurator
 	 */
 	public static function getConfigurationClass() {
 		return self::$configurationClass;
@@ -600,7 +603,7 @@ 
 	
 	/**
 	 * Returns the current configuration file
-	 * @return the configuration file
+	 * @return null|string configuration file
 	 */
 	public static function getConfigurationFile() {
 		return self::$configurationFile;

Indentation +549 added lines, -549 removed lines

@@ -43,7 +43,7 @@ 
  * @version	   SVN: $Id: Logger.php 824193 2009-10-11 22:51:24Z chammers $
  * @link	   http://logging.apache.org/log4php
  */
- /*
+    /*
   * TODO:
   * Localization: setResourceBundle($bundle) : not supported
   * Localization: getResourceBundle: not supported
@@ -51,576 +51,576 @@ 
   * Localization: l7dlog($priority, $key, $params, $t) : not supported
   */
 class Logger {
-	private static $_classes = array(
-		'LoggerException' => '/LoggerException.php',
-		'LoggerHierarchy' => '/LoggerHierarchy.php',
-		'LoggerLayout' => '/LoggerLayout.php',
-		'LoggerLevel' => '/LoggerLevel.php',
-		'LoggerMDC' => '/LoggerMDC.php',
-		'LoggerNDC' => '/LoggerNDC.php',
-		'LoggerReflectionUtils' => '/LoggerReflectionUtils.php',
-		'LoggerConfigurator' => '/LoggerConfigurator.php',
-		'LoggerConfiguratorBasic' => '/configurators/LoggerConfiguratorBasic.php',
-		'LoggerConfiguratorIni' => '/configurators/LoggerConfiguratorIni.php',
-		'LoggerConfiguratorPhp' => '/configurators/LoggerConfiguratorPhp.php',
-		'LoggerConfiguratorXml' => '/configurators/LoggerConfiguratorXml.php',
-		'LoggerRoot' => '/LoggerRoot.php',
-		'LoggerAppender' => '/LoggerAppender.php',
-		'LoggerAppenderPool' => '/LoggerAppenderPool.php',
-		'LoggerAppenderAdodb' => '/appenders/LoggerAppenderAdodb.php',
-		'LoggerAppenderPDO' => '/appenders/LoggerAppenderPDO.php',
-		'LoggerAppenderConsole' => '/appenders/LoggerAppenderConsole.php',
-		'LoggerAppenderDailyFile' => '/appenders/LoggerAppenderDailyFile.php',
-		'LoggerAppenderEcho' => '/appenders/LoggerAppenderEcho.php',
-		'LoggerAppenderFile' => '/appenders/LoggerAppenderFile.php',
-		'LoggerAppenderMail' => '/appenders/LoggerAppenderMail.php',
-		'LoggerAppenderMailEvent' => '/appenders/LoggerAppenderMailEvent.php',
-		'LoggerAppenderNull' => '/appenders/LoggerAppenderNull.php',
-		'LoggerAppenderPhp' => '/appenders/LoggerAppenderPhp.php',
-		'LoggerAppenderRollingFile' => '/appenders/LoggerAppenderRollingFile.php',
-		'LoggerAppenderSocket' => '/appenders/LoggerAppenderSocket.php',
-		'LoggerAppenderSyslog' => '/appenders/LoggerAppenderSyslog.php',
-		'LoggerFormattingInfo' => '/helpers/LoggerFormattingInfo.php',
-		'LoggerOptionConverter' => '/helpers/LoggerOptionConverter.php',
-		'LoggerPatternConverter' => '/helpers/LoggerPatternConverter.php',
-		'LoggerBasicPatternConverter' => '/helpers/LoggerBasicPatternConverter.php',
-		'LoggerCategoryPatternConverter' => '/helpers/LoggerCategoryPatternConverter.php',
-		'LoggerClassNamePatternConverter' => '/helpers/LoggerClassNamePatternConverter.php',
-		'LoggerDatePatternConverter' => '/helpers/LoggerDatePatternConverter.php',
-		'LoggerLiteralPatternConverter' => '/helpers/LoggerLiteralPatternConverter.php',
-		'LoggerLocationPatternConverter' => '/helpers/LoggerLocationPatternConverter.php',
-		'LoggerMDCPatternConverter' => '/helpers/LoggerMDCPatternConverter.php',
-		'LoggerNamedPatternConverter' => '/helpers/LoggerNamedPatternConverter.php',
-		'LoggerBasicPatternConverter' => '/helpers/LoggerBasicPatternConverter.php',
-		'LoggerLiteralPatternConverter' => '/helpers/LoggerLiteralPatternConverter.php',
-		'LoggerDatePatternConverter' => '/helpers/LoggerDatePatternConverter.php',
-		'LoggerMDCPatternConverter' => '/helpers/LoggerMDCPatternConverter.php',
-		'LoggerLocationPatternConverter' => '/helpers/LoggerLocationPatternConverter.php',
-		'LoggerNamedPatternConverter' => '/helpers/LoggerNamedPatternConverter.php',
-		'LoggerClassNamePatternConverter' => '/helpers/LoggerClassNamePatternConverter.php',
-		'LoggerCategoryPatternConverter' => '/helpers/LoggerCategoryPatternConverter.php',
-		'LoggerPatternParser' => '/helpers/LoggerPatternParser.php',
-		'LoggerLayoutHtml' => '/layouts/LoggerLayoutHtml.php',
-		'LoggerLayoutSimple' => '/layouts/LoggerLayoutSimple.php',
-		'LoggerLayoutTTCC' => '/layouts/LoggerLayoutTTCC.php',
-		'LoggerLayoutPattern' => '/layouts/LoggerLayoutPattern.php',
-		'LoggerLayoutXml' => '/layouts/LoggerLayoutXml.php',
-		'LoggerRendererDefault' => '/renderers/LoggerRendererDefault.php',
-		'LoggerRendererObject' => '/renderers/LoggerRendererObject.php',
-		'LoggerRendererMap' => '/renderers/LoggerRendererMap.php',
-		'LoggerLocationInfo' => '/LoggerLocationInfo.php',
-		'LoggerLoggingEvent' => '/LoggerLoggingEvent.php',
-		'LoggerFilter' => '/LoggerFilter.php',
-		'LoggerFilterDenyAll' => '/filters/LoggerFilterDenyAll.php',
-		'LoggerFilterLevelMatch' => '/filters/LoggerFilterLevelMatch.php',
-		'LoggerFilterLevelRange' => '/filters/LoggerFilterLevelRange.php',
-		'LoggerFilterStringMatch' => '/filters/LoggerFilterStringMatch.php',
-	);
+    private static $_classes = array(
+        'LoggerException' => '/LoggerException.php',
+        'LoggerHierarchy' => '/LoggerHierarchy.php',
+        'LoggerLayout' => '/LoggerLayout.php',
+        'LoggerLevel' => '/LoggerLevel.php',
+        'LoggerMDC' => '/LoggerMDC.php',
+        'LoggerNDC' => '/LoggerNDC.php',
+        'LoggerReflectionUtils' => '/LoggerReflectionUtils.php',
+        'LoggerConfigurator' => '/LoggerConfigurator.php',
+        'LoggerConfiguratorBasic' => '/configurators/LoggerConfiguratorBasic.php',
+        'LoggerConfiguratorIni' => '/configurators/LoggerConfiguratorIni.php',
+        'LoggerConfiguratorPhp' => '/configurators/LoggerConfiguratorPhp.php',
+        'LoggerConfiguratorXml' => '/configurators/LoggerConfiguratorXml.php',
+        'LoggerRoot' => '/LoggerRoot.php',
+        'LoggerAppender' => '/LoggerAppender.php',
+        'LoggerAppenderPool' => '/LoggerAppenderPool.php',
+        'LoggerAppenderAdodb' => '/appenders/LoggerAppenderAdodb.php',
+        'LoggerAppenderPDO' => '/appenders/LoggerAppenderPDO.php',
+        'LoggerAppenderConsole' => '/appenders/LoggerAppenderConsole.php',
+        'LoggerAppenderDailyFile' => '/appenders/LoggerAppenderDailyFile.php',
+        'LoggerAppenderEcho' => '/appenders/LoggerAppenderEcho.php',
+        'LoggerAppenderFile' => '/appenders/LoggerAppenderFile.php',
+        'LoggerAppenderMail' => '/appenders/LoggerAppenderMail.php',
+        'LoggerAppenderMailEvent' => '/appenders/LoggerAppenderMailEvent.php',
+        'LoggerAppenderNull' => '/appenders/LoggerAppenderNull.php',
+        'LoggerAppenderPhp' => '/appenders/LoggerAppenderPhp.php',
+        'LoggerAppenderRollingFile' => '/appenders/LoggerAppenderRollingFile.php',
+        'LoggerAppenderSocket' => '/appenders/LoggerAppenderSocket.php',
+        'LoggerAppenderSyslog' => '/appenders/LoggerAppenderSyslog.php',
+        'LoggerFormattingInfo' => '/helpers/LoggerFormattingInfo.php',
+        'LoggerOptionConverter' => '/helpers/LoggerOptionConverter.php',
+        'LoggerPatternConverter' => '/helpers/LoggerPatternConverter.php',
+        'LoggerBasicPatternConverter' => '/helpers/LoggerBasicPatternConverter.php',
+        'LoggerCategoryPatternConverter' => '/helpers/LoggerCategoryPatternConverter.php',
+        'LoggerClassNamePatternConverter' => '/helpers/LoggerClassNamePatternConverter.php',
+        'LoggerDatePatternConverter' => '/helpers/LoggerDatePatternConverter.php',
+        'LoggerLiteralPatternConverter' => '/helpers/LoggerLiteralPatternConverter.php',
+        'LoggerLocationPatternConverter' => '/helpers/LoggerLocationPatternConverter.php',
+        'LoggerMDCPatternConverter' => '/helpers/LoggerMDCPatternConverter.php',
+        'LoggerNamedPatternConverter' => '/helpers/LoggerNamedPatternConverter.php',
+        'LoggerBasicPatternConverter' => '/helpers/LoggerBasicPatternConverter.php',
+        'LoggerLiteralPatternConverter' => '/helpers/LoggerLiteralPatternConverter.php',
+        'LoggerDatePatternConverter' => '/helpers/LoggerDatePatternConverter.php',
+        'LoggerMDCPatternConverter' => '/helpers/LoggerMDCPatternConverter.php',
+        'LoggerLocationPatternConverter' => '/helpers/LoggerLocationPatternConverter.php',
+        'LoggerNamedPatternConverter' => '/helpers/LoggerNamedPatternConverter.php',
+        'LoggerClassNamePatternConverter' => '/helpers/LoggerClassNamePatternConverter.php',
+        'LoggerCategoryPatternConverter' => '/helpers/LoggerCategoryPatternConverter.php',
+        'LoggerPatternParser' => '/helpers/LoggerPatternParser.php',
+        'LoggerLayoutHtml' => '/layouts/LoggerLayoutHtml.php',
+        'LoggerLayoutSimple' => '/layouts/LoggerLayoutSimple.php',
+        'LoggerLayoutTTCC' => '/layouts/LoggerLayoutTTCC.php',
+        'LoggerLayoutPattern' => '/layouts/LoggerLayoutPattern.php',
+        'LoggerLayoutXml' => '/layouts/LoggerLayoutXml.php',
+        'LoggerRendererDefault' => '/renderers/LoggerRendererDefault.php',
+        'LoggerRendererObject' => '/renderers/LoggerRendererObject.php',
+        'LoggerRendererMap' => '/renderers/LoggerRendererMap.php',
+        'LoggerLocationInfo' => '/LoggerLocationInfo.php',
+        'LoggerLoggingEvent' => '/LoggerLoggingEvent.php',
+        'LoggerFilter' => '/LoggerFilter.php',
+        'LoggerFilterDenyAll' => '/filters/LoggerFilterDenyAll.php',
+        'LoggerFilterLevelMatch' => '/filters/LoggerFilterLevelMatch.php',
+        'LoggerFilterLevelRange' => '/filters/LoggerFilterLevelRange.php',
+        'LoggerFilterStringMatch' => '/filters/LoggerFilterStringMatch.php',
+    );
 
-	/**
-	 * Class autoloader
-	 * This method is provided to be invoked within an __autoload() magic method.
-	 * @param string class name
-	 */
-	public static function autoload($className) {
-		if(isset(self::$_classes[$className])) {
-			include LOG4PHP_DIR.self::$_classes[$className];
-		}
-	}
+    /**
+     * Class autoloader
+     * This method is provided to be invoked within an __autoload() magic method.
+     * @param string class name
+     */
+    public static function autoload($className) {
+        if(isset(self::$_classes[$className])) {
+            include LOG4PHP_DIR.self::$_classes[$className];
+        }
+    }
 
-	/**
-	 * Additivity is set to true by default, that is children inherit the 
-	 * appenders of their ancestors by default.
-	 * @var boolean
-	 */
-	private $additive = true;
-	
-	/** @var string fully qualified class name */
-	private $fqcn = 'Logger';
+    /**
+     * Additivity is set to true by default, that is children inherit the 
+     * appenders of their ancestors by default.
+     * @var boolean
+     */
+    private $additive = true;
+	
+    /** @var string fully qualified class name */
+    private $fqcn = 'Logger';
 
-	/** @var LoggerLevel The assigned level of this category. */
-	private $level = null;
+    /** @var LoggerLevel The assigned level of this category. */
+    private $level = null;
 	
-	/** @var string name of this category. */
-	private $name = '';
+    /** @var string name of this category. */
+    private $name = '';
 	
-	/** @var Logger The parent of this category. Null if this is the root logger*/
-	private $parent = null;
+    /** @var Logger The parent of this category. Null if this is the root logger*/
+    private $parent = null;
 	
-	/**
-	 * @var array collection of appenders
-	 * @see LoggerAppender
-	 */
-	private $aai = array();
+    /**
+     * @var array collection of appenders
+     * @see LoggerAppender
+     */
+    private $aai = array();
 
-	/** the hierarchy used by log4php */
-	private static $hierarchy;
-	
-	/** the configurator class name */
-	private static $configurationClass = 'LoggerConfiguratorBasic';
-	
-	/** the path to the configuration file */
-	private static $configurationFile = null;
-	
-	/** inidicates if log4php has already been initialized */
-	private static $initialized = false;
-	
-	/**
-	 * Constructor.
-	 * @param  string  $name  Category name	  
-	 */
-	public function __construct($name) {
-		$this->name = $name;
-	}
-	
-	/**
-	 * Return the category name.
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	} 
+    /** the hierarchy used by log4php */
+    private static $hierarchy;
+	
+    /** the configurator class name */
+    private static $configurationClass = 'LoggerConfiguratorBasic';
+	
+    /** the path to the configuration file */
+    private static $configurationFile = null;
+	
+    /** inidicates if log4php has already been initialized */
+    private static $initialized = false;
+	
+    /**
+     * Constructor.
+     * @param  string  $name  Category name	  
+     */
+    public function __construct($name) {
+        $this->name = $name;
+    }
+	
+    /**
+     * Return the category name.
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    } 
 
-	/**
-	 * Returns the parent of this category.
-	 * @return Logger
-	 */
-	public function getParent() {
-		return $this->parent;
-	}	  
-	
-	/**
-	 * Returns the hierarchy used by this Logger.
-	 * Caution: do not use this hierarchy unless you have called initialize().
-	 * To get Loggers, use the Logger::getLogger and Logger::getRootLogger methods
-	 * instead of operating on on the hierarchy directly.
-	 * 
-	 * @deprecated - will be moved to private
-	 * @return LoggerHierarchy
-	 */
-	public static function getHierarchy() {
-		if(!isset(self::$hierarchy)) {
-			self::$hierarchy = new LoggerHierarchy(new LoggerRoot());
-		}
-		return self::$hierarchy;
-	}
-	
-	/* Logging methods */
-	/**
-	 * Log a message object with the DEBUG level including the caller.
-	 *
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function debug($message, $caller = null) {
-		$this->logLevel($message, LoggerLevel::getLevelDebug(), $caller);
-	} 
+    /**
+     * Returns the parent of this category.
+     * @return Logger
+     */
+    public function getParent() {
+        return $this->parent;
+    }	  
+	
+    /**
+     * Returns the hierarchy used by this Logger.
+     * Caution: do not use this hierarchy unless you have called initialize().
+     * To get Loggers, use the Logger::getLogger and Logger::getRootLogger methods
+     * instead of operating on on the hierarchy directly.
+     * 
+     * @deprecated - will be moved to private
+     * @return LoggerHierarchy
+     */
+    public static function getHierarchy() {
+        if(!isset(self::$hierarchy)) {
+            self::$hierarchy = new LoggerHierarchy(new LoggerRoot());
+        }
+        return self::$hierarchy;
+    }
+	
+    /* Logging methods */
+    /**
+     * Log a message object with the DEBUG level including the caller.
+     *
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function debug($message, $caller = null) {
+        $this->logLevel($message, LoggerLevel::getLevelDebug(), $caller);
+    } 
 
 
-	/**
-	 * Log a message object with the INFO Level.
-	 *
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function info($message, $caller = null) {
-		$this->logLevel($message, LoggerLevel::getLevelInfo(), $caller);
-	}
+    /**
+     * Log a message object with the INFO Level.
+     *
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function info($message, $caller = null) {
+        $this->logLevel($message, LoggerLevel::getLevelInfo(), $caller);
+    }
 
-	/**
-	 * Log a message with the WARN level.
-	 *
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function warn($message, $caller = null) {
-		$this->logLevel($message, LoggerLevel::getLevelWarn(), $caller);
-	}
-	
-	/**
-	 * Log a message object with the ERROR level including the caller.
-	 *
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function error($message, $caller = null) {
-		$this->logLevel($message, LoggerLevel::getLevelError(), $caller);
-	}
-	
-	/**
-	 * Log a message object with the FATAL level including the caller.
-	 *
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function fatal($message, $caller = null) {
-		$this->logLevel($message, LoggerLevel::getLevelFatal(), $caller);
-	}
-	
-	/**
-	 * This method creates a new logging event and logs the event without further checks.
-	 *
-	 * It should not be called directly. Use {@link info()}, {@link debug()}, {@link warn()},
-	 * {@link error()} and {@link fatal()} wrappers.
-	 *
-	 * @param string $fqcn Fully Qualified Class Name of the Logger
-	 * @param mixed $caller caller object or caller string id
-	 * @param LoggerLevel $level log level	   
-	 * @param mixed $message message
-	 * @see LoggerLoggingEvent			
-	 */
-	public function forcedLog($fqcn, $caller, $level, $message) {
-		$this->callAppenders(new LoggerLoggingEvent($fqcn, $this, $level, $message));
-	} 
-	
-	
-		/**
-	 * Check whether this category is enabled for the DEBUG Level.
-	 * @return boolean
-	 */
-	public function isDebugEnabled() {
-		return $this->isEnabledFor(LoggerLevel::getLevelDebug());
-	}		
+    /**
+     * Log a message with the WARN level.
+     *
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function warn($message, $caller = null) {
+        $this->logLevel($message, LoggerLevel::getLevelWarn(), $caller);
+    }
+	
+    /**
+     * Log a message object with the ERROR level including the caller.
+     *
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function error($message, $caller = null) {
+        $this->logLevel($message, LoggerLevel::getLevelError(), $caller);
+    }
+	
+    /**
+     * Log a message object with the FATAL level including the caller.
+     *
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function fatal($message, $caller = null) {
+        $this->logLevel($message, LoggerLevel::getLevelFatal(), $caller);
+    }
+	
+    /**
+     * This method creates a new logging event and logs the event without further checks.
+     *
+     * It should not be called directly. Use {@link info()}, {@link debug()}, {@link warn()},
+     * {@link error()} and {@link fatal()} wrappers.
+     *
+     * @param string $fqcn Fully Qualified Class Name of the Logger
+     * @param mixed $caller caller object or caller string id
+     * @param LoggerLevel $level log level	   
+     * @param mixed $message message
+     * @see LoggerLoggingEvent			
+     */
+    public function forcedLog($fqcn, $caller, $level, $message) {
+        $this->callAppenders(new LoggerLoggingEvent($fqcn, $this, $level, $message));
+    } 
+	
+	
+        /**
+         * Check whether this category is enabled for the DEBUG Level.
+         * @return boolean
+         */
+    public function isDebugEnabled() {
+        return $this->isEnabledFor(LoggerLevel::getLevelDebug());
+    }		
 
-	/**
-	 * Check whether this category is enabled for a given Level passed as parameter.
-	 *
-	 * @param LoggerLevel level
-	 * @return boolean
-	 */
-	public function isEnabledFor($level) {
-		return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel()));
-	} 
+    /**
+     * Check whether this category is enabled for a given Level passed as parameter.
+     *
+     * @param LoggerLevel level
+     * @return boolean
+     */
+    public function isEnabledFor($level) {
+        return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel()));
+    } 
 
-	/**
-	 * Check whether this category is enabled for the info Level.
-	 * @return boolean
-	 * @see LoggerLevel
-	 */
-	public function isInfoEnabled() {
-		return $this->isEnabledFor(LoggerLevel::getLevelInfo());
-	} 
+    /**
+     * Check whether this category is enabled for the info Level.
+     * @return boolean
+     * @see LoggerLevel
+     */
+    public function isInfoEnabled() {
+        return $this->isEnabledFor(LoggerLevel::getLevelInfo());
+    } 
 
-	/**
-	 * This generic form is intended to be used by wrappers.
-	 *
-	 * @param LoggerLevel $priority a valid level
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function log($priority, $message, $caller = null) {
-		if($this->isEnabledFor($priority)) {
-			$this->forcedLog($this->fqcn, $caller, $priority, $message);
-		}
-	}
-	
-	/**
-	 * If assertion parameter is false, then logs msg as an error statement.
-	 *
-	 * @param bool $assertion
-	 * @param string $msg message to log
-	 */
-	public function assertLog($assertion = true, $msg = '') {
-		if($assertion == false) {
-			$this->error($msg);
-		}
-	}
+    /**
+     * This generic form is intended to be used by wrappers.
+     *
+     * @param LoggerLevel $priority a valid level
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function log($priority, $message, $caller = null) {
+        if($this->isEnabledFor($priority)) {
+            $this->forcedLog($this->fqcn, $caller, $priority, $message);
+        }
+    }
+	
+    /**
+     * If assertion parameter is false, then logs msg as an error statement.
+     *
+     * @param bool $assertion
+     * @param string $msg message to log
+     */
+    public function assertLog($assertion = true, $msg = '') {
+        if($assertion == false) {
+            $this->error($msg);
+        }
+    }
 	 
-	private function logLevel($message, $level, $caller = null) {
-		if($level->isGreaterOrEqual($this->getEffectiveLevel())) {
-			$this->forcedLog($this->fqcn, $caller, $level, $message);
-		}
-	} 
-	
-	/* Factory methods */ 
-	
-	/**
-	 * Get a Logger by name (Delegate to {@link Logger})
-	 * 
-	 * @param string $name logger name
-	 * @param LoggerFactory $factory a {@link LoggerFactory} instance or null
-	 * @return Logger
-	 * @static 
-	 */
-	public static function getLogger($name) {
-		if(!self::isInitialized()) {
-			self::initialize();
-		}
-		return self::getHierarchy()->getLogger($name);
-	}
-	
-	/**
-	 * get the Root Logger (Delegate to {@link Logger})
-	 * @return LoggerRoot
-	 * @static 
-	 */	   
-	public static function getRootLogger() {
-		if(!self::isInitialized()) {
-			self::initialize();
-		}
-		return self::getHierarchy()->getRootLogger();	  
-	}
-	
-	/* Configuration methods */
-	
-	/**
-	 * Add a new Appender to the list of appenders of this Category instance.
-	 *
-	 * @param LoggerAppender $newAppender
-	 */
-	public function addAppender($newAppender) {
-		$appenderName = $newAppender->getName();
-		$this->aai[$appenderName] = $newAppender;
-	}
-	
-	/**
-	 * Remove all previously added appenders from this Category instance.
-	 */
-	public function removeAllAppenders() {
-		$appenderNames = array_keys($this->aai);
-		$enumAppenders = count($appenderNames);
-		for($i = 0; $i < $enumAppenders; $i++) {
-			$this->removeAppender($appenderNames[$i]); 
-		}
-	} 
+    private function logLevel($message, $level, $caller = null) {
+        if($level->isGreaterOrEqual($this->getEffectiveLevel())) {
+            $this->forcedLog($this->fqcn, $caller, $level, $message);
+        }
+    } 
+	
+    /* Factory methods */ 
+	
+    /**
+     * Get a Logger by name (Delegate to {@link Logger})
+     * 
+     * @param string $name logger name
+     * @param LoggerFactory $factory a {@link LoggerFactory} instance or null
+     * @return Logger
+     * @static 
+     */
+    public static function getLogger($name) {
+        if(!self::isInitialized()) {
+            self::initialize();
+        }
+        return self::getHierarchy()->getLogger($name);
+    }
+	
+    /**
+     * get the Root Logger (Delegate to {@link Logger})
+     * @return LoggerRoot
+     * @static 
+     */	   
+    public static function getRootLogger() {
+        if(!self::isInitialized()) {
+            self::initialize();
+        }
+        return self::getHierarchy()->getRootLogger();	  
+    }
+	
+    /* Configuration methods */
+	
+    /**
+     * Add a new Appender to the list of appenders of this Category instance.
+     *
+     * @param LoggerAppender $newAppender
+     */
+    public function addAppender($newAppender) {
+        $appenderName = $newAppender->getName();
+        $this->aai[$appenderName] = $newAppender;
+    }
+	
+    /**
+     * Remove all previously added appenders from this Category instance.
+     */
+    public function removeAllAppenders() {
+        $appenderNames = array_keys($this->aai);
+        $enumAppenders = count($appenderNames);
+        for($i = 0; $i < $enumAppenders; $i++) {
+            $this->removeAppender($appenderNames[$i]); 
+        }
+    } 
 			
-	/**
-	 * Remove the appender passed as parameter form the list of appenders.
-	 *
-	 * @param mixed $appender can be an appender name or a {@link LoggerAppender} object
-	 */
-	public function removeAppender($appender) {
-		if($appender instanceof LoggerAppender) {
-			$appender->close();
-			unset($this->aai[$appender->getName()]);
-		} else if (is_string($appender) and isset($this->aai[$appender])) {
-			$this->aai[$appender]->close();
-			unset($this->aai[$appender]);
-		}
-	} 
+    /**
+     * Remove the appender passed as parameter form the list of appenders.
+     *
+     * @param mixed $appender can be an appender name or a {@link LoggerAppender} object
+     */
+    public function removeAppender($appender) {
+        if($appender instanceof LoggerAppender) {
+            $appender->close();
+            unset($this->aai[$appender->getName()]);
+        } else if (is_string($appender) and isset($this->aai[$appender])) {
+            $this->aai[$appender]->close();
+            unset($this->aai[$appender]);
+        }
+    } 
 			
-	/**
-	 * Call the appenders in the hierarchy starting at this.
-	 *
-	 * @param LoggerLoggingEvent $event 
-	 */
-	public function callAppenders($event) {
-		if(count($this->aai) > 0) {
-			foreach(array_keys($this->aai) as $appenderName) {
-				$this->aai[$appenderName]->doAppend($event);
-			}
-		}
-		if($this->parent != null and $this->getAdditivity()) {
-			$this->parent->callAppenders($event);
-		}
-	}
-	
-	/**
-	 * Get the appenders contained in this category as an array.
-	 * @return array collection of appenders
-	 */
-	public function getAllAppenders() {
-		return array_values($this->aai);
-	}
-	
-	/**
-	 * Look for the appender named as name.
-	 * @return LoggerAppender
-	 */
-	public function getAppender($name) {
-		return $this->aai[$name];
-	}
-	
-	/**
-	 * Get the additivity flag for this Category instance.
-	 * @return boolean
-	 */
-	public function getAdditivity() {
-		return $this->additive;
-	}
+    /**
+     * Call the appenders in the hierarchy starting at this.
+     *
+     * @param LoggerLoggingEvent $event 
+     */
+    public function callAppenders($event) {
+        if(count($this->aai) > 0) {
+            foreach(array_keys($this->aai) as $appenderName) {
+                $this->aai[$appenderName]->doAppend($event);
+            }
+        }
+        if($this->parent != null and $this->getAdditivity()) {
+            $this->parent->callAppenders($event);
+        }
+    }
+	
+    /**
+     * Get the appenders contained in this category as an array.
+     * @return array collection of appenders
+     */
+    public function getAllAppenders() {
+        return array_values($this->aai);
+    }
+	
+    /**
+     * Look for the appender named as name.
+     * @return LoggerAppender
+     */
+    public function getAppender($name) {
+        return $this->aai[$name];
+    }
+	
+    /**
+     * Get the additivity flag for this Category instance.
+     * @return boolean
+     */
+    public function getAdditivity() {
+        return $this->additive;
+    }
  
-	/**
-	 * Starting from this category, search the category hierarchy for a non-null level and return it.
-	 * @see LoggerLevel
-	 * @return LoggerLevel or null
-	 */
-	public function getEffectiveLevel() {
-		for($c = $this; $c != null; $c = $c->parent) {
-			if($c->getLevel() !== null) {
-				return $c->getLevel();
-			}
-		}
-		return null;
-	}
+    /**
+     * Starting from this category, search the category hierarchy for a non-null level and return it.
+     * @see LoggerLevel
+     * @return LoggerLevel or null
+     */
+    public function getEffectiveLevel() {
+        for($c = $this; $c != null; $c = $c->parent) {
+            if($c->getLevel() !== null) {
+                return $c->getLevel();
+            }
+        }
+        return null;
+    }
   
-	/**
-	 * Returns the assigned Level, if any, for this Category.
-	 * @return LoggerLevel or null 
-	 */
-	public function getLevel() {
-		return $this->level;
-	}
-	
-	/**
-	 * Set the level of this Category.
-	 *
-	 * @param LoggerLevel $level a level string or a level constant 
-	 */
-	public function setLevel($level) {
-		$this->level = $level;
-	}
-	
-	/**
-	 * Clears all logger definitions
-	 * 
-	 * @static
-	 * @return boolean 
-	 */
-	public static function clear() {
-		return self::getHierarchy()->clear();	 
-	}
-	
-	/**
-	 * Destroy configurations for logger definitions
-	 * 
-	 * @static
-	 * @return boolean 
-	 */
-	public static function resetConfiguration() {
-		$result = self::getHierarchy()->resetConfiguration();
-		self::$initialized = false;
-		self::$configurationClass = 'LoggerConfiguratorBasic';
-		self::$configurationFile = null;
-		return $result;	 
-	}
+    /**
+     * Returns the assigned Level, if any, for this Category.
+     * @return LoggerLevel or null 
+     */
+    public function getLevel() {
+        return $this->level;
+    }
+	
+    /**
+     * Set the level of this Category.
+     *
+     * @param LoggerLevel $level a level string or a level constant 
+     */
+    public function setLevel($level) {
+        $this->level = $level;
+    }
+	
+    /**
+     * Clears all logger definitions
+     * 
+     * @static
+     * @return boolean 
+     */
+    public static function clear() {
+        return self::getHierarchy()->clear();	 
+    }
+	
+    /**
+     * Destroy configurations for logger definitions
+     * 
+     * @static
+     * @return boolean 
+     */
+    public static function resetConfiguration() {
+        $result = self::getHierarchy()->resetConfiguration();
+        self::$initialized = false;
+        self::$configurationClass = 'LoggerConfiguratorBasic';
+        self::$configurationFile = null;
+        return $result;	 
+    }
 
-	/**
-	 * Safely close all appenders.
-	 * This is not longer necessary due the appenders shutdown via
-	 * destructors. 
-	 * @deprecated
-	 * @static
-	 */
-	public static function shutdown() {
-		return self::getHierarchy()->shutdown();	   
-	}
-	
-	/**
-	 * check if a given logger exists.
-	 * 
-	 * @param string $name logger name 
-	 * @static
-	 * @return boolean
-	 */
-	public static function exists($name) {
-		return self::getHierarchy()->exists($name);
-	}
-	
-	/**
-	 * Returns an array this whole Logger instances.
-	 * 
-	 * @static
-	 * @see Logger
-	 * @return array
-	 */
-	public static function getCurrentLoggers() {
-		return self::getHierarchy()->getCurrentLoggers();
-	}
-	
-	/**
-	 * Is the appender passed as parameter attached to this category?
-	 *
-	 * @param LoggerAppender $appender
-	 */
-	public function isAttached($appender) {
-		return isset($this->aai[$appender->getName()]);
-	} 
+    /**
+     * Safely close all appenders.
+     * This is not longer necessary due the appenders shutdown via
+     * destructors. 
+     * @deprecated
+     * @static
+     */
+    public static function shutdown() {
+        return self::getHierarchy()->shutdown();	   
+    }
+	
+    /**
+     * check if a given logger exists.
+     * 
+     * @param string $name logger name 
+     * @static
+     * @return boolean
+     */
+    public static function exists($name) {
+        return self::getHierarchy()->exists($name);
+    }
+	
+    /**
+     * Returns an array this whole Logger instances.
+     * 
+     * @static
+     * @see Logger
+     * @return array
+     */
+    public static function getCurrentLoggers() {
+        return self::getHierarchy()->getCurrentLoggers();
+    }
+	
+    /**
+     * Is the appender passed as parameter attached to this category?
+     *
+     * @param LoggerAppender $appender
+     */
+    public function isAttached($appender) {
+        return isset($this->aai[$appender->getName()]);
+    } 
 		   
-	/**
-	 * Set the additivity flag for this Category instance.
-	 *
-	 * @param boolean $additive
-	 */
-	public function setAdditivity($additive) {
-		$this->additive = (bool)$additive;
-	}
+    /**
+     * Set the additivity flag for this Category instance.
+     *
+     * @param boolean $additive
+     */
+    public function setAdditivity($additive) {
+        $this->additive = (bool)$additive;
+    }
 
-	/**
-	 * Sets the parent logger of this logger
-	 */
-	public function setParent(Logger $logger) {
-		$this->parent = $logger;
-	} 
-	
-	/**
-	 * Configures Log4PHP.
-	 * This method needs to be called before the first logging event
-	 * has occured. If this methode is never called, the standard configuration
-	 * takes place (@see LoggerConfiguratorBasic).
-	 * If only the configuration file is given, the configurator class will
-	 * be the XML Configurator or the INI Configurator, if no .xml ending
-	 * could be determined.
-	 * 
-	 * If a custom configurator should be used, the configuration file
-	 * is either null or the path to file the custom configurator uses.
-	 * Make sure the configurator is already or can be loaded by PHP when necessary.
-	 * 
-	 * @param String $configurationFile the configuration file
-	 * @param String $configurationClass the configurator class
-	 */
-	public static function configure($configurationFile = null, 
-									 $configurationClass = null ) {
-		if($configurationClass === null && $configurationFile === null) {
-			self::$configurationClass = 'LoggerConfiguratorBasic';
-			return;
-		}
+    /**
+     * Sets the parent logger of this logger
+     */
+    public function setParent(Logger $logger) {
+        $this->parent = $logger;
+    } 
+	
+    /**
+     * Configures Log4PHP.
+     * This method needs to be called before the first logging event
+     * has occured. If this methode is never called, the standard configuration
+     * takes place (@see LoggerConfiguratorBasic).
+     * If only the configuration file is given, the configurator class will
+     * be the XML Configurator or the INI Configurator, if no .xml ending
+     * could be determined.
+     * 
+     * If a custom configurator should be used, the configuration file
+     * is either null or the path to file the custom configurator uses.
+     * Make sure the configurator is already or can be loaded by PHP when necessary.
+     * 
+     * @param String $configurationFile the configuration file
+     * @param String $configurationClass the configurator class
+     */
+    public static function configure($configurationFile = null, 
+                                        $configurationClass = null ) {
+        if($configurationClass === null && $configurationFile === null) {
+            self::$configurationClass = 'LoggerConfiguratorBasic';
+            return;
+        }
 									 	
-		if($configurationClass !== null) {
-			self::$configurationFile = $configurationFile;
-			self::$configurationClass = $configurationClass;
-			return;
-		}
+        if($configurationClass !== null) {
+            self::$configurationFile = $configurationFile;
+            self::$configurationClass = $configurationClass;
+            return;
+        }
 		
-		if (strtolower(substr( $configurationFile, -4 )) == '.xml') {
-			self::$configurationFile = $configurationFile;
-			self::$configurationClass = 'LoggerConfiguratorXml';
-		} else {
-			self::$configurationFile = $configurationFile;
-			self::$configurationClass = 'LoggerConfiguratorIni';
-		}
-	}
-	
-	/**
-	 * Returns the current configurator
-	 * @return the configurator
-	 */
-	public static function getConfigurationClass() {
-		return self::$configurationClass;
-	}
-	
-	/**
-	 * Returns the current configuration file
-	 * @return the configuration file
-	 */
-	public static function getConfigurationFile() {
-		return self::$configurationFile;
-	}
-	
-	/**
-	 * Returns, true, if the log4php framework is already initialized
-	 */
-	private static function isInitialized() {
-		return self::$initialized;
-	}
-	
-	/**
-	 * Initializes the log4php framework.
-	 * @return boolean
-	 */
-	public static function initialize() {
-		self::$initialized = true;
-		$instance = LoggerReflectionUtils::createObject(self::$configurationClass);
-		$result = $instance->configure(self::getHierarchy(), self::$configurationFile);
-		return $result;
-	}
+        if (strtolower(substr( $configurationFile, -4 )) == '.xml') {
+            self::$configurationFile = $configurationFile;
+            self::$configurationClass = 'LoggerConfiguratorXml';
+        } else {
+            self::$configurationFile = $configurationFile;
+            self::$configurationClass = 'LoggerConfiguratorIni';
+        }
+    }
+	
+    /**
+     * Returns the current configurator
+     * @return the configurator
+     */
+    public static function getConfigurationClass() {
+        return self::$configurationClass;
+    }
+	
+    /**
+     * Returns the current configuration file
+     * @return the configuration file
+     */
+    public static function getConfigurationFile() {
+        return self::$configurationFile;
+    }
+	
+    /**
+     * Returns, true, if the log4php framework is already initialized
+     */
+    private static function isInitialized() {
+        return self::$initialized;
+    }
+	
+    /**
+     * Initializes the log4php framework.
+     * @return boolean
+     */
+    public static function initialize() {
+        self::$initialized = true;
+        $instance = LoggerReflectionUtils::createObject(self::$configurationClass);
+        $result = $instance->configure(self::getHierarchy(), self::$configurationFile);
+        return $result;
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -123,7 +123,7 @@ 
 	 * @param string class name
 	 */
 	public static function autoload($className) {
-		if(isset(self::$_classes[$className])) {
+		if (isset(self::$_classes[$className])) {
 			include LOG4PHP_DIR.self::$_classes[$className];
 		}
 	}
@@ -199,7 +199,7 @@ 
 	 * @return LoggerHierarchy
 	 */
 	public static function getHierarchy() {
-		if(!isset(self::$hierarchy)) {
+		if (!isset(self::$hierarchy)) {
 			self::$hierarchy = new LoggerHierarchy(new LoggerRoot());
 		}
 		return self::$hierarchy;
@@ -289,7 +289,7 @@ 
 	 * @return boolean
 	 */
 	public function isEnabledFor($level) {
-		return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel()));
+		return (bool) ($level->isGreaterOrEqual($this->getEffectiveLevel()));
 	} 
 
 	/**
@@ -309,7 +309,7 @@ 
 	 * @param mixed $caller caller object or caller string id
 	 */
 	public function log($priority, $message, $caller = null) {
-		if($this->isEnabledFor($priority)) {
+		if ($this->isEnabledFor($priority)) {
 			$this->forcedLog($this->fqcn, $caller, $priority, $message);
 		}
 	}
@@ -321,13 +321,13 @@ 
 	 * @param string $msg message to log
 	 */
 	public function assertLog($assertion = true, $msg = '') {
-		if($assertion == false) {
+		if ($assertion == false) {
 			$this->error($msg);
 		}
 	}
 	 
 	private function logLevel($message, $level, $caller = null) {
-		if($level->isGreaterOrEqual($this->getEffectiveLevel())) {
+		if ($level->isGreaterOrEqual($this->getEffectiveLevel())) {
 			$this->forcedLog($this->fqcn, $caller, $level, $message);
 		}
 	} 
@@ -343,7 +343,7 @@ 
 	 * @static 
 	 */
 	public static function getLogger($name) {
-		if(!self::isInitialized()) {
+		if (!self::isInitialized()) {
 			self::initialize();
 		}
 		return self::getHierarchy()->getLogger($name);
@@ -355,7 +355,7 @@ 
 	 * @static 
 	 */	   
 	public static function getRootLogger() {
-		if(!self::isInitialized()) {
+		if (!self::isInitialized()) {
 			self::initialize();
 		}
 		return self::getHierarchy()->getRootLogger();	  
@@ -379,7 +379,7 @@ 
 	public function removeAllAppenders() {
 		$appenderNames = array_keys($this->aai);
 		$enumAppenders = count($appenderNames);
-		for($i = 0; $i < $enumAppenders; $i++) {
+		for ($i = 0; $i < $enumAppenders; $i++) {
 			$this->removeAppender($appenderNames[$i]); 
 		}
 	} 
@@ -390,7 +390,7 @@ 
 	 * @param mixed $appender can be an appender name or a {@link LoggerAppender} object
 	 */
 	public function removeAppender($appender) {
-		if($appender instanceof LoggerAppender) {
+		if ($appender instanceof LoggerAppender) {
 			$appender->close();
 			unset($this->aai[$appender->getName()]);
 		} else if (is_string($appender) and isset($this->aai[$appender])) {
@@ -405,12 +405,12 @@ 
 	 * @param LoggerLoggingEvent $event 
 	 */
 	public function callAppenders($event) {
-		if(count($this->aai) > 0) {
-			foreach(array_keys($this->aai) as $appenderName) {
+		if (count($this->aai) > 0) {
+			foreach (array_keys($this->aai) as $appenderName) {
 				$this->aai[$appenderName]->doAppend($event);
 			}
 		}
-		if($this->parent != null and $this->getAdditivity()) {
+		if ($this->parent != null and $this->getAdditivity()) {
 			$this->parent->callAppenders($event);
 		}
 	}
@@ -445,8 +445,8 @@ 
 	 * @return LoggerLevel or null
 	 */
 	public function getEffectiveLevel() {
-		for($c = $this; $c != null; $c = $c->parent) {
-			if($c->getLevel() !== null) {
+		for ($c = $this; $c != null; $c = $c->parent) {
+			if ($c->getLevel() !== null) {
 				return $c->getLevel();
 			}
 		}
@@ -542,7 +542,7 @@ 
 	 * @param boolean $additive
 	 */
 	public function setAdditivity($additive) {
-		$this->additive = (bool)$additive;
+		$this->additive = (bool) $additive;
 	}
 
 	/**
@@ -569,19 +569,19 @@ 
 	 * @param String $configurationClass the configurator class
 	 */
 	public static function configure($configurationFile = null, 
-									 $configurationClass = null ) {
-		if($configurationClass === null && $configurationFile === null) {
+									 $configurationClass = null) {
+		if ($configurationClass === null && $configurationFile === null) {
 			self::$configurationClass = 'LoggerConfiguratorBasic';
 			return;
 		}
 									 	
-		if($configurationClass !== null) {
+		if ($configurationClass !== null) {
 			self::$configurationFile = $configurationFile;
 			self::$configurationClass = $configurationClass;
 			return;
 		}
 		
-		if (strtolower(substr( $configurationFile, -4 )) == '.xml') {
+		if (strtolower(substr($configurationFile, -4)) == '.xml') {
 			self::$configurationFile = $configurationFile;
 			self::$configurationClass = 'LoggerConfiguratorXml';
 		} else {

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
  * 
  * @var string 
  */
-if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
+if (!defined('LOG4PHP_DIR')) {
+    define('LOG4PHP_DIR', dirname(__FILE__));
+}
 
 spl_autoload_register(array('Logger', 'autoload'));