pradosoft / prado

framework/IO/TTarFileExtractor.php

Doc Comments +9 added lines

@@ -224,6 +224,9 @@ 
       return $v_block;
     }
 
+    /**
+     * @param double $p_len
+     */
     private function _jumpBlock($p_len=null)
     {
       if (is_resource($this->_file)) {
@@ -317,6 +320,12 @@ 
       return true;
     }
 
+    /**
+     * @param string $p_path
+     * @param string $p_mode
+     * @param integer $p_file_list
+     * @param string $p_remove_path
+     */
     protected function _extractList($p_path, &$p_list_detail, $p_mode,
 	                      $p_file_list, $p_remove_path)
     {

Indentation +510 added lines, -510 removed lines

@@ -35,537 +35,537 @@
  */
 class TTarFileExtractor
 {
-    /**
-    * @var string Name of the Tar
-    */
-    private $_tarname='';
-
-    /**
-    * @var file descriptor
-    */
-    private $_file=0;
-
-    /**
-    * @var string Local Tar name of a remote Tar (http:// or ftp://)
-    */
-    private $_temp_tarname='';
-
-    /**
-    * Archive_Tar Class constructor. This flavour of the constructor only
-    * declare a new Archive_Tar object, identifying it by the name of the
-    * tar file.
-    *
-    * @param    string  $p_tarname  The name of the tar archive to create
-    * @access public
-    */
-    public function __construct($p_tarname)
-    {
-        $this->_tarname = $p_tarname;
-    }
-
-    public function __destruct()
-    {
-        $this->_close();
-        // ----- Look for a local copy to delete
-        if ($this->_temp_tarname != '')
-            @unlink($this->_temp_tarname);
-    }
-
-    public function extract($p_path='')
-    {
-        return $this->extractModify($p_path, '');
-    }
-
-    /**
-    * This method extract all the content of the archive in the directory
-    * indicated by $p_path. When relevant the memorized path of the
-    * files/dir can be modified by removing the $p_remove_path path at the
-    * beginning of the file/dir path.
-    * While extracting a file, if the directory path does not exists it is
-    * created.
-    * While extracting a file, if the file already exists it is replaced
-    * without looking for last modification date.
-    * While extracting a file, if the file already exists and is write
-    * protected, the extraction is aborted.
-    * While extracting a file, if a directory with the same name already
-    * exists, the extraction is aborted.
-    * While extracting a directory, if a file with the same name already
-    * exists, the extraction is aborted.
-    * While extracting a file/directory if the destination directory exist
-    * and is write protected, or does not exist but can not be created,
-    * the extraction is aborted.
-    * If after extraction an extracted file does not show the correct
-    * stored file size, the extraction is aborted.
-    * When the extraction is aborted, a PEAR error text is set and false
-    * is returned. However the result can be a partial extraction that may
-    * need to be manually cleaned.
-    *
-    * @param string $p_path         The path of the directory where the
-	*                               files/dir need to by extracted.
-    * @param string $p_remove_path  Part of the memorized path that can be
-	*                               removed if present at the beginning of
-	*                               the file/dir path.
-    * @return boolean               true on success, false on error.
-    * @access public
-    */
-    protected function extractModify($p_path, $p_remove_path)
-    {
-        $v_result = true;
-        $v_list_detail = array();
-
-        if ($v_result = $this->_openRead()) {
-            $v_result = $this->_extractList($p_path, $v_list_detail,
-			                                "complete", 0, $p_remove_path);
-            $this->_close();
-        }
-
-        return $v_result;
-    }
-
-    protected function _error($p_message)
-    {
+	/**
+	 * @var string Name of the Tar
+	 */
+	private $_tarname='';
+
+	/**
+	 * @var file descriptor
+	 */
+	private $_file=0;
+
+	/**
+	 * @var string Local Tar name of a remote Tar (http:// or ftp://)
+	 */
+	private $_temp_tarname='';
+
+	/**
+	 * Archive_Tar Class constructor. This flavour of the constructor only
+	 * declare a new Archive_Tar object, identifying it by the name of the
+	 * tar file.
+	 *
+	 * @param    string  $p_tarname  The name of the tar archive to create
+	 * @access public
+	 */
+	public function __construct($p_tarname)
+	{
+		$this->_tarname = $p_tarname;
+	}
+
+	public function __destruct()
+	{
+		$this->_close();
+		// ----- Look for a local copy to delete
+		if ($this->_temp_tarname != '')
+			@unlink($this->_temp_tarname);
+	}
+
+	public function extract($p_path='')
+	{
+		return $this->extractModify($p_path, '');
+	}
+
+	/**
+	 * This method extract all the content of the archive in the directory
+	 * indicated by $p_path. When relevant the memorized path of the
+	 * files/dir can be modified by removing the $p_remove_path path at the
+	 * beginning of the file/dir path.
+	 * While extracting a file, if the directory path does not exists it is
+	 * created.
+	 * While extracting a file, if the file already exists it is replaced
+	 * without looking for last modification date.
+	 * While extracting a file, if the file already exists and is write
+	 * protected, the extraction is aborted.
+	 * While extracting a file, if a directory with the same name already
+	 * exists, the extraction is aborted.
+	 * While extracting a directory, if a file with the same name already
+	 * exists, the extraction is aborted.
+	 * While extracting a file/directory if the destination directory exist
+	 * and is write protected, or does not exist but can not be created,
+	 * the extraction is aborted.
+	 * If after extraction an extracted file does not show the correct
+	 * stored file size, the extraction is aborted.
+	 * When the extraction is aborted, a PEAR error text is set and false
+	 * is returned. However the result can be a partial extraction that may
+	 * need to be manually cleaned.
+	 *
+	 * @param string $p_path         The path of the directory where the
+	 *                               files/dir need to by extracted.
+	 * @param string $p_remove_path  Part of the memorized path that can be
+	 *                               removed if present at the beginning of
+	 *                               the file/dir path.
+	 * @return boolean               true on success, false on error.
+	 * @access public
+	 */
+	protected function extractModify($p_path, $p_remove_path)
+	{
+		$v_result = true;
+		$v_list_detail = array();
+
+		if ($v_result = $this->_openRead()) {
+			$v_result = $this->_extractList($p_path, $v_list_detail,
+											"complete", 0, $p_remove_path);
+			$this->_close();
+		}
+
+		return $v_result;
+	}
+
+	protected function _error($p_message)
+	{
 		throw new Exception($p_message);
-    }
-
-    private function _isArchive($p_filename=null)
-    {
-        if ($p_filename == null) {
-            $p_filename = $this->_tarname;
-        }
-        clearstatcache();
-        return @is_file($p_filename);
-    }
-
-    private function _openRead()
-    {
-        if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
-
-          // ----- Look if a local copy need to be done
-          if ($this->_temp_tarname == '') {
-              $this->_temp_tarname = uniqid('tar').'.tmp';
-              if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
-                $this->_error('Unable to open in read mode \''
-				              .$this->_tarname.'\'');
-                $this->_temp_tarname = '';
-                return false;
-              }
-              if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
-                $this->_error('Unable to open in write mode \''
-				              .$this->_temp_tarname.'\'');
-                $this->_temp_tarname = '';
-                return false;
-              }
-              while ($v_data = @fread($v_file_from, 1024))
-                  @fwrite($v_file_to, $v_data);
-              @fclose($v_file_from);
-              @fclose($v_file_to);
-          }
-
-          // ----- File to open if the local copy
-          $v_filename = $this->_temp_tarname;
-
-        } else
-          // ----- File to open if the normal Tar file
-          $v_filename = $this->_tarname;
+	}
+
+	private function _isArchive($p_filename=null)
+	{
+		if ($p_filename == null) {
+			$p_filename = $this->_tarname;
+		}
+		clearstatcache();
+		return @is_file($p_filename);
+	}
+
+	private function _openRead()
+	{
+		if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
+
+		  // ----- Look if a local copy need to be done
+		  if ($this->_temp_tarname == '') {
+			  $this->_temp_tarname = uniqid('tar').'.tmp';
+			  if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
+				$this->_error('Unable to open in read mode \''
+							  .$this->_tarname.'\'');
+				$this->_temp_tarname = '';
+				return false;
+			  }
+			  if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
+				$this->_error('Unable to open in write mode \''
+							  .$this->_temp_tarname.'\'');
+				$this->_temp_tarname = '';
+				return false;
+			  }
+			  while ($v_data = @fread($v_file_from, 1024))
+				  @fwrite($v_file_to, $v_data);
+			  @fclose($v_file_from);
+			  @fclose($v_file_to);
+		  }
+
+		  // ----- File to open if the local copy
+		  $v_filename = $this->_temp_tarname;
+
+		} else
+		  // ----- File to open if the normal Tar file
+		  $v_filename = $this->_tarname;
 
 		$this->_file = @fopen($v_filename, "rb");
 
-        if ($this->_file == 0) {
-            $this->_error('Unable to open in read mode \''.$v_filename.'\'');
-            return false;
-        }
+		if ($this->_file == 0) {
+			$this->_error('Unable to open in read mode \''.$v_filename.'\'');
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    private function _close()
-    {
-        //if (isset($this->_file)) {
-        if (is_resource($this->_file))
+	private function _close()
+	{
+		//if (isset($this->_file)) {
+		if (is_resource($this->_file))
 		{
-               @fclose($this->_file);
-            $this->_file = 0;
-        }
-
-        // ----- Look if a local copy need to be erase
-        // Note that it might be interesting to keep the url for a time : ToDo
-        if ($this->_temp_tarname != '') {
-            @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
-        }
-
-        return true;
-    }
-
-    private function _cleanFile()
-    {
-        $this->_close();
-
-        // ----- Look for a local copy
-        if ($this->_temp_tarname != '') {
-            // ----- Remove the local copy but not the remote tarname
-            @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
-        } else {
-            // ----- Remove the local tarname file
-            @unlink($this->_tarname);
-        }
-        $this->_tarname = '';
-
-        return true;
-    }
-
-    private function _readBlock()
-    {
-      $v_block = null;
-      if (is_resource($this->_file)) {
-              $v_block = @fread($this->_file, 512);
-      }
-      return $v_block;
-    }
-
-    private function _jumpBlock($p_len=null)
-    {
-      if (is_resource($this->_file)) {
-          if ($p_len === null)
-              $p_len = 1;
-
-              @fseek($this->_file, @ftell($this->_file)+($p_len*512));
-      }
-      return true;
-    }
-
-    private function _readHeader($v_binary_data, &$v_header)
-    {
-        if (strlen($v_binary_data)==0) {
-            $v_header['filename'] = '';
-            return true;
-        }
-
-        if (strlen($v_binary_data) != 512) {
-            $v_header['filename'] = '';
-            $this->_error('Invalid block size : '.strlen($v_binary_data));
-            return false;
-        }
-
-        // ----- Calculate the checksum
-        $v_checksum = 0;
-        // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
-        // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
-        // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
-
-        $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
-		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
+			   @fclose($this->_file);
+			$this->_file = 0;
+		}
+
+		// ----- Look if a local copy need to be erase
+		// Note that it might be interesting to keep the url for a time : ToDo
+		if ($this->_temp_tarname != '') {
+			@unlink($this->_temp_tarname);
+			$this->_temp_tarname = '';
+		}
+
+		return true;
+	}
+
+	private function _cleanFile()
+	{
+		$this->_close();
+
+		// ----- Look for a local copy
+		if ($this->_temp_tarname != '') {
+			// ----- Remove the local copy but not the remote tarname
+			@unlink($this->_temp_tarname);
+			$this->_temp_tarname = '';
+		} else {
+			// ----- Remove the local tarname file
+			@unlink($this->_tarname);
+		}
+		$this->_tarname = '';
+
+		return true;
+	}
+
+	private function _readBlock()
+	{
+	  $v_block = null;
+	  if (is_resource($this->_file)) {
+			  $v_block = @fread($this->_file, 512);
+	  }
+	  return $v_block;
+	}
+
+	private function _jumpBlock($p_len=null)
+	{
+	  if (is_resource($this->_file)) {
+		  if ($p_len === null)
+			  $p_len = 1;
+
+			  @fseek($this->_file, @ftell($this->_file)+($p_len*512));
+	  }
+	  return true;
+	}
+
+	private function _readHeader($v_binary_data, &$v_header)
+	{
+		if (strlen($v_binary_data)==0) {
+			$v_header['filename'] = '';
+			return true;
+		}
+
+		if (strlen($v_binary_data) != 512) {
+			$v_header['filename'] = '';
+			$this->_error('Invalid block size : '.strlen($v_binary_data));
+			return false;
+		}
+
+		// ----- Calculate the checksum
+		$v_checksum = 0;
+		// ..... First part of the header
+		for ($i=0; $i<148; $i++)
+			$v_checksum+=ord(substr($v_binary_data,$i,1));
+		// ..... Ignore the checksum value and replace it by ' ' (space)
+		for ($i=148; $i<156; $i++)
+			$v_checksum += ord(' ');
+		// ..... Last part of the header
+		for ($i=156; $i<512; $i++)
+		   $v_checksum+=ord(substr($v_binary_data,$i,1));
+
+		$v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
+						 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
 						 ."a32uname/a32gname/a8devmajor/a8devminor",
 						 $v_binary_data);
 
-        // ----- Extract the checksum
-        $v_header['checksum'] = OctDec(trim($v_data['checksum']));
-        if ($v_header['checksum'] != $v_checksum) {
-            $v_header['filename'] = '';
+		// ----- Extract the checksum
+		$v_header['checksum'] = OctDec(trim($v_data['checksum']));
+		if ($v_header['checksum'] != $v_checksum) {
+			$v_header['filename'] = '';
 
-            // ----- Look for last block (empty block)
-            if (($v_checksum == 256) && ($v_header['checksum'] == 0))
-                return true;
+			// ----- Look for last block (empty block)
+			if (($v_checksum == 256) && ($v_header['checksum'] == 0))
+				return true;
 
-            $this->_error('Invalid checksum for file "'.$v_data['filename']
-			              .'" : '.$v_checksum.' calculated, '
+			$this->_error('Invalid checksum for file "'.$v_data['filename']
+						  .'" : '.$v_checksum.' calculated, '
 						  .$v_header['checksum'].' expected');
-            return false;
-        }
-
-        // ----- Extract the properties
-        $v_header['filename'] = trim($v_data['filename']);
-        $v_header['mode'] = OctDec(trim($v_data['mode']));
-        $v_header['uid'] = OctDec(trim($v_data['uid']));
-        $v_header['gid'] = OctDec(trim($v_data['gid']));
-        $v_header['size'] = OctDec(trim($v_data['size']));
-        $v_header['mtime'] = OctDec(trim($v_data['mtime']));
-        if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
-          $v_header['size'] = 0;
-        }
-        return true;
-    }
-
-    private function _readLongHeader(&$v_header)
-    {
-      $v_filename = '';
-      $n = floor($v_header['size']/512);
-      for ($i=0; $i<$n; $i++) {
-        $v_content = $this->_readBlock();
-        $v_filename .= $v_content;
-      }
-      if (($v_header['size'] % 512) != 0) {
-        $v_content = $this->_readBlock();
-        $v_filename .= $v_content;
-      }
-
-      // ----- Read the next header
-      $v_binary_data = $this->_readBlock();
-
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
-
-      $v_header['filename'] = $v_filename;
-
-      return true;
-    }
-
-    protected function _extractList($p_path, &$p_list_detail, $p_mode,
-	                      $p_file_list, $p_remove_path)
-    {
-    $v_result=true;
-    $v_nb = 0;
-    $v_extract_all = true;
-    $v_listing = false;
-
-    $p_path = $this->_translateWinPath($p_path, false);
-    if ($p_path == '' || (substr($p_path, 0, 1) != '/'
-	    && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-      $p_path = "./".$p_path;
-    }
-    $p_remove_path = $this->_translateWinPath($p_remove_path);
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
-      $p_remove_path .= '/';
-    $p_remove_path_size = strlen($p_remove_path);
-
-    switch ($p_mode) {
-      case "complete" :
-        $v_extract_all = true;
-        $v_listing = false;
-      break;
-      case "partial" :
-          $v_extract_all = false;
-          $v_listing = false;
-      break;
-      case "list" :
-          $v_extract_all = false;
-          $v_listing = true;
-      break;
-      default :
-        $this->_error('Invalid extract mode ('.$p_mode.')');
-        return false;
-    }
-
-    clearstatcache();
-
-    while (strlen($v_binary_data = $this->_readBlock()) != 0)
-    {
-      $v_extract_file = false;
-      $v_extraction_stopped = 0;
-
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
-
-      if ($v_header['filename'] == '') {
-        continue;
-      }
-
-      // ----- Look for long filename
-      if ($v_header['typeflag'] == 'L') {
-        if (!$this->_readLongHeader($v_header))
-          return false;
-      }
-
-      if ((!$v_extract_all) && (is_array($p_file_list))) {
-        // ----- By default no unzip if the file is not found
-        $v_extract_file = false;
-
-        for ($i=0; $i<sizeof($p_file_list); $i++) {
-          // ----- Look if it is a directory
-          if (substr($p_file_list[$i], -1) == '/') {
-            // ----- Look if the directory is in the filename path
-            if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
-			    && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
-				    == $p_file_list[$i])) {
-              $v_extract_file = true;
-              break;
-            }
-          }
-
-          // ----- It is a file, so compare the file names
-          elseif ($p_file_list[$i] == $v_header['filename']) {
-            $v_extract_file = true;
-            break;
-          }
-        }
-      } else {
-        $v_extract_file = true;
-      }
-
-      // ----- Look if this file need to be extracted
-      if (($v_extract_file) && (!$v_listing))
-      {
-        if (($p_remove_path != '')
-            && (substr($v_header['filename'], 0, $p_remove_path_size)
-			    == $p_remove_path))
-          $v_header['filename'] = substr($v_header['filename'],
-		                                 $p_remove_path_size);
-        if (($p_path != './') && ($p_path != '/')) {
-          while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
-
-          if (substr($v_header['filename'], 0, 1) == '/')
-              $v_header['filename'] = $p_path.$v_header['filename'];
-          else
-            $v_header['filename'] = $p_path.'/'.$v_header['filename'];
-        }
-        if (file_exists($v_header['filename'])) {
-          if (   (@is_dir($v_header['filename']))
-		      && ($v_header['typeflag'] == '')) {
-            $this->_error('File '.$v_header['filename']
-			              .' already exists as a directory');
-            return false;
-          }
-          if (   ($this->_isArchive($v_header['filename']))
-		      && ($v_header['typeflag'] == "5")) {
-            $this->_error('Directory '.$v_header['filename']
-			              .' already exists as a file');
-            return false;
-          }
-          if (!is_writeable($v_header['filename'])) {
-            $this->_error('File '.$v_header['filename']
-			              .' already exists and is write protected');
-            return false;
-          }
-          if (filemtime($v_header['filename']) > $v_header['mtime']) {
-            // To be completed : An error or silent no replace ?
-          }
-        }
-
-        // ----- Check the directory availability and create it if necessary
-        elseif (($v_result
-		         = $this->_dirCheck(($v_header['typeflag'] == "5"
-				                    ?$v_header['filename']
+			return false;
+		}
+
+		// ----- Extract the properties
+		$v_header['filename'] = trim($v_data['filename']);
+		$v_header['mode'] = OctDec(trim($v_data['mode']));
+		$v_header['uid'] = OctDec(trim($v_data['uid']));
+		$v_header['gid'] = OctDec(trim($v_data['gid']));
+		$v_header['size'] = OctDec(trim($v_data['size']));
+		$v_header['mtime'] = OctDec(trim($v_data['mtime']));
+		if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
+		  $v_header['size'] = 0;
+		}
+		return true;
+	}
+
+	private function _readLongHeader(&$v_header)
+	{
+	  $v_filename = '';
+	  $n = floor($v_header['size']/512);
+	  for ($i=0; $i<$n; $i++) {
+		$v_content = $this->_readBlock();
+		$v_filename .= $v_content;
+	  }
+	  if (($v_header['size'] % 512) != 0) {
+		$v_content = $this->_readBlock();
+		$v_filename .= $v_content;
+	  }
+
+	  // ----- Read the next header
+	  $v_binary_data = $this->_readBlock();
+
+	  if (!$this->_readHeader($v_binary_data, $v_header))
+		return false;
+
+	  $v_header['filename'] = $v_filename;
+
+	  return true;
+	}
+
+	protected function _extractList($p_path, &$p_list_detail, $p_mode,
+						  $p_file_list, $p_remove_path)
+	{
+	$v_result=true;
+	$v_nb = 0;
+	$v_extract_all = true;
+	$v_listing = false;
+
+	$p_path = $this->_translateWinPath($p_path, false);
+	if ($p_path == '' || (substr($p_path, 0, 1) != '/'
+		&& substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
+	  $p_path = "./".$p_path;
+	}
+	$p_remove_path = $this->_translateWinPath($p_remove_path);
+
+	// ----- Look for path to remove format (should end by /)
+	if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
+	  $p_remove_path .= '/';
+	$p_remove_path_size = strlen($p_remove_path);
+
+	switch ($p_mode) {
+	  case "complete" :
+		$v_extract_all = true;
+		$v_listing = false;
+	  break;
+	  case "partial" :
+		  $v_extract_all = false;
+		  $v_listing = false;
+	  break;
+	  case "list" :
+		  $v_extract_all = false;
+		  $v_listing = true;
+	  break;
+	  default :
+		$this->_error('Invalid extract mode ('.$p_mode.')');
+		return false;
+	}
+
+	clearstatcache();
+
+	while (strlen($v_binary_data = $this->_readBlock()) != 0)
+	{
+	  $v_extract_file = false;
+	  $v_extraction_stopped = 0;
+
+	  if (!$this->_readHeader($v_binary_data, $v_header))
+		return false;
+
+	  if ($v_header['filename'] == '') {
+		continue;
+	  }
+
+	  // ----- Look for long filename
+	  if ($v_header['typeflag'] == 'L') {
+		if (!$this->_readLongHeader($v_header))
+		  return false;
+	  }
+
+	  if ((!$v_extract_all) && (is_array($p_file_list))) {
+		// ----- By default no unzip if the file is not found
+		$v_extract_file = false;
+
+		for ($i=0; $i<sizeof($p_file_list); $i++) {
+		  // ----- Look if it is a directory
+		  if (substr($p_file_list[$i], -1) == '/') {
+			// ----- Look if the directory is in the filename path
+			if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
+				&& (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
+					== $p_file_list[$i])) {
+			  $v_extract_file = true;
+			  break;
+			}
+		  }
+
+		  // ----- It is a file, so compare the file names
+		  elseif ($p_file_list[$i] == $v_header['filename']) {
+			$v_extract_file = true;
+			break;
+		  }
+		}
+	  } else {
+		$v_extract_file = true;
+	  }
+
+	  // ----- Look if this file need to be extracted
+	  if (($v_extract_file) && (!$v_listing))
+	  {
+		if (($p_remove_path != '')
+			&& (substr($v_header['filename'], 0, $p_remove_path_size)
+				== $p_remove_path))
+		  $v_header['filename'] = substr($v_header['filename'],
+										 $p_remove_path_size);
+		if (($p_path != './') && ($p_path != '/')) {
+		  while (substr($p_path, -1) == '/')
+			$p_path = substr($p_path, 0, strlen($p_path)-1);
+
+		  if (substr($v_header['filename'], 0, 1) == '/')
+			  $v_header['filename'] = $p_path.$v_header['filename'];
+		  else
+			$v_header['filename'] = $p_path.'/'.$v_header['filename'];
+		}
+		if (file_exists($v_header['filename'])) {
+		  if (   (@is_dir($v_header['filename']))
+			  && ($v_header['typeflag'] == '')) {
+			$this->_error('File '.$v_header['filename']
+						  .' already exists as a directory');
+			return false;
+		  }
+		  if (   ($this->_isArchive($v_header['filename']))
+			  && ($v_header['typeflag'] == "5")) {
+			$this->_error('Directory '.$v_header['filename']
+						  .' already exists as a file');
+			return false;
+		  }
+		  if (!is_writeable($v_header['filename'])) {
+			$this->_error('File '.$v_header['filename']
+						  .' already exists and is write protected');
+			return false;
+		  }
+		  if (filemtime($v_header['filename']) > $v_header['mtime']) {
+			// To be completed : An error or silent no replace ?
+		  }
+		}
+
+		// ----- Check the directory availability and create it if necessary
+		elseif (($v_result
+				 = $this->_dirCheck(($v_header['typeflag'] == "5"
+									?$v_header['filename']
 									:dirname($v_header['filename'])))) != 1) {
-            $this->_error('Unable to create path for '.$v_header['filename']);
-            return false;
-        }
-
-        if ($v_extract_file) {
-          if ($v_header['typeflag'] == "5") {
-            if (!@file_exists($v_header['filename'])) {
-                if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
-                    $this->_error('Unable to create directory {'
-					              .$v_header['filename'].'}');
-                    return false;
-                }
-                chmod($v_header['filename'], PRADO_CHMOD);
-            }
-          } else {
-              if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-                  $this->_error('Error while opening {'.$v_header['filename']
-				                .'} in write binary mode');
-                  return false;
-              } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
-                      $v_content = $this->_readBlock();
-                      fwrite($v_dest_file, $v_content, 512);
-                  }
-            if (($v_header['size'] % 512) != 0) {
-              $v_content = $this->_readBlock();
-              fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
-            }
-
-            @fclose($v_dest_file);
-
-            // ----- Change the file mode, mtime
-            @touch($v_header['filename'], $v_header['mtime']);
-            // To be completed
-            //chmod($v_header[filename], DecOct($v_header[mode]));
-          }
-
-          // ----- Check the file size
-          clearstatcache();
-          if (filesize($v_header['filename']) != $v_header['size']) {
-              $this->_error('Extracted file '.$v_header['filename']
-			                .' does not have the correct file size \''
+			$this->_error('Unable to create path for '.$v_header['filename']);
+			return false;
+		}
+
+		if ($v_extract_file) {
+		  if ($v_header['typeflag'] == "5") {
+			if (!@file_exists($v_header['filename'])) {
+				if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
+					$this->_error('Unable to create directory {'
+								  .$v_header['filename'].'}');
+					return false;
+				}
+				chmod($v_header['filename'], PRADO_CHMOD);
+			}
+		  } else {
+			  if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
+				  $this->_error('Error while opening {'.$v_header['filename']
+								.'} in write binary mode');
+				  return false;
+			  } else {
+				  $n = floor($v_header['size']/512);
+				  for ($i=0; $i<$n; $i++) {
+					  $v_content = $this->_readBlock();
+					  fwrite($v_dest_file, $v_content, 512);
+				  }
+			if (($v_header['size'] % 512) != 0) {
+			  $v_content = $this->_readBlock();
+			  fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
+			}
+
+			@fclose($v_dest_file);
+
+			// ----- Change the file mode, mtime
+			@touch($v_header['filename'], $v_header['mtime']);
+			// To be completed
+			//chmod($v_header[filename], DecOct($v_header[mode]));
+		  }
+
+		  // ----- Check the file size
+		  clearstatcache();
+		  if (filesize($v_header['filename']) != $v_header['size']) {
+			  $this->_error('Extracted file '.$v_header['filename']
+							.' does not have the correct file size \''
 							.filesize($v_header['filename'])
 							.'\' ('.$v_header['size']
 							.' expected). Archive may be corrupted.');
-              return false;
-          }
-          }
-        } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
-        }
-      } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
-      }
-
-      /* TBC : Seems to be unused ...
+			  return false;
+		  }
+		  }
+		} else {
+		  $this->_jumpBlock(ceil(($v_header['size']/512)));
+		}
+	  } else {
+		  $this->_jumpBlock(ceil(($v_header['size']/512)));
+	  }
+
+	  /* TBC : Seems to be unused ...
       if ($this->_compress)
         $v_end_of_file = @gzeof($this->_file);
       else
         $v_end_of_file = @feof($this->_file);
         */
 
-      if ($v_listing || $v_extract_file || $v_extraction_stopped) {
-        // ----- Log extracted files
-        if (($v_file_dir = dirname($v_header['filename']))
-		    == $v_header['filename'])
-          $v_file_dir = '';
-        if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
-          $v_file_dir = '/';
-
-        $p_list_detail[$v_nb++] = $v_header;
-      }
-    }
-
-        return true;
-    }
-
-    /**
-     * Check if a directory exists and create it (including parent
-     * dirs) if not.
-     *
-     * @param string $p_dir directory to check
-     *
-     * @return bool true if the directory exists or was created
-     */
-    protected function _dirCheck($p_dir)
-    {
-        if ((@is_dir($p_dir)) || ($p_dir == ''))
-            return true;
-
-        $p_parent_dir = dirname($p_dir);
-
-        if (($p_parent_dir != $p_dir) &&
-            ($p_parent_dir != '') &&
-            (!$this->_dirCheck($p_parent_dir)))
-             return false;
-
-        if (!@mkdir($p_dir, PRADO_CHMOD)) {
-            $this->_error("Unable to create directory '$p_dir'");
-            return false;
-        }
-        chmod($p_dir,PRADO_CHMOD);
-
-        return true;
-    }
-
-    protected function _translateWinPath($p_path, $p_remove_disk_letter=true)
-    {
-      if (substr(PHP_OS, 0, 3) == 'WIN') {
-          // ----- Look for potential disk letter
-          if (   ($p_remove_disk_letter)
-		      && (($v_position = strpos($p_path, ':')) != false)) {
-              $p_path = substr($p_path, $v_position+1);
-          }
-          // ----- Change potential windows directory separator
-          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-              $p_path = strtr($p_path, '\\', '/');
-          }
-      }
-      return $p_path;
-    }
+	  if ($v_listing || $v_extract_file || $v_extraction_stopped) {
+		// ----- Log extracted files
+		if (($v_file_dir = dirname($v_header['filename']))
+			== $v_header['filename'])
+		  $v_file_dir = '';
+		if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
+		  $v_file_dir = '/';
+
+		$p_list_detail[$v_nb++] = $v_header;
+	  }
+	}
+
+		return true;
+	}
+
+	/**
+	 * Check if a directory exists and create it (including parent
+	 * dirs) if not.
+	 *
+	 * @param string $p_dir directory to check
+	 *
+	 * @return bool true if the directory exists or was created
+	 */
+	protected function _dirCheck($p_dir)
+	{
+		if ((@is_dir($p_dir)) || ($p_dir == ''))
+			return true;
+
+		$p_parent_dir = dirname($p_dir);
+
+		if (($p_parent_dir != $p_dir) &&
+			($p_parent_dir != '') &&
+			(!$this->_dirCheck($p_parent_dir)))
+			 return false;
+
+		if (!@mkdir($p_dir, PRADO_CHMOD)) {
+			$this->_error("Unable to create directory '$p_dir'");
+			return false;
+		}
+		chmod($p_dir,PRADO_CHMOD);
+
+		return true;
+	}
+
+	protected function _translateWinPath($p_path, $p_remove_disk_letter=true)
+	{
+	  if (substr(PHP_OS, 0, 3) == 'WIN') {
+		  // ----- Look for potential disk letter
+		  if (   ($p_remove_disk_letter)
+			  && (($v_position = strpos($p_path, ':')) != false)) {
+			  $p_path = substr($p_path, $v_position+1);
+		  }
+		  // ----- Change potential windows directory separator
+		  if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+			  $p_path = strtr($p_path, '\\', '/');
+		  }
+	  }
+	  return $p_path;
+	}
 }

Spacing +50 added lines, -50 removed lines

@@ -38,17 +38,17 @@ 
     /**
     * @var string Name of the Tar
     */
-    private $_tarname='';
+    private $_tarname = '';
 
     /**
     * @var file descriptor
     */
-    private $_file=0;
+    private $_file = 0;
 
     /**
     * @var string Local Tar name of a remote Tar (http:// or ftp://)
     */
-    private $_temp_tarname='';
+    private $_temp_tarname = '';
 
     /**
     * Archive_Tar Class constructor. This flavour of the constructor only
@@ -71,7 +71,7 @@ 
             @unlink($this->_temp_tarname);
     }
 
-    public function extract($p_path='')
+    public function extract($p_path = '')
     {
         return $this->extractModify($p_path, '');
     }
@@ -127,7 +127,7 @@ 
 		throw new Exception($p_message);
     }
 
-    private function _isArchive($p_filename=null)
+    private function _isArchive($p_filename = null)
     {
         if ($p_filename == null) {
             $p_filename = $this->_tarname;
@@ -142,16 +142,16 @@ 
 
           // ----- Look if a local copy need to be done
           if ($this->_temp_tarname == '') {
-              $this->_temp_tarname = uniqid('tar').'.tmp';
+              $this->_temp_tarname = uniqid('tar') . '.tmp';
               if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
                 $this->_error('Unable to open in read mode \''
-				              .$this->_tarname.'\'');
+				              .$this->_tarname . '\'');
                 $this->_temp_tarname = '';
                 return false;
               }
               if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
                 $this->_error('Unable to open in write mode \''
-				              .$this->_temp_tarname.'\'');
+				              .$this->_temp_tarname . '\'');
                 $this->_temp_tarname = '';
                 return false;
               }
@@ -171,7 +171,7 @@ 
 		$this->_file = @fopen($v_filename, "rb");
 
         if ($this->_file == 0) {
-            $this->_error('Unable to open in read mode \''.$v_filename.'\'');
+            $this->_error('Unable to open in read mode \'' . $v_filename . '\'');
             return false;
         }
 
@@ -224,41 +224,41 @@ 
       return $v_block;
     }
 
-    private function _jumpBlock($p_len=null)
+    private function _jumpBlock($p_len = null)
     {
       if (is_resource($this->_file)) {
           if ($p_len === null)
               $p_len = 1;
 
-              @fseek($this->_file, @ftell($this->_file)+($p_len*512));
+              @fseek($this->_file, @ftell($this->_file) + ($p_len * 512));
       }
       return true;
     }
 
     private function _readHeader($v_binary_data, &$v_header)
     {
-        if (strlen($v_binary_data)==0) {
+        if (strlen($v_binary_data) == 0) {
             $v_header['filename'] = '';
             return true;
         }
 
         if (strlen($v_binary_data) != 512) {
             $v_header['filename'] = '';
-            $this->_error('Invalid block size : '.strlen($v_binary_data));
+            $this->_error('Invalid block size : ' . strlen($v_binary_data));
             return false;
         }
 
         // ----- Calculate the checksum
         $v_checksum = 0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i = 0; $i < 148; $i++)
+            $v_checksum += ord(substr($v_binary_data, $i, 1));
         // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
+        for ($i = 148; $i < 156; $i++)
             $v_checksum += ord(' ');
         // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i = 156; $i < 512; $i++)
+           $v_checksum += ord(substr($v_binary_data, $i, 1));
 
         $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
 		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
@@ -274,9 +274,9 @@ 
             if (($v_checksum == 256) && ($v_header['checksum'] == 0))
                 return true;
 
-            $this->_error('Invalid checksum for file "'.$v_data['filename']
-			              .'" : '.$v_checksum.' calculated, '
-						  .$v_header['checksum'].' expected');
+            $this->_error('Invalid checksum for file "' . $v_data['filename']
+			              .'" : ' . $v_checksum . ' calculated, '
+						  .$v_header['checksum'] . ' expected');
             return false;
         }
 
@@ -296,8 +296,8 @@ 
     private function _readLongHeader(&$v_header)
     {
       $v_filename = '';
-      $n = floor($v_header['size']/512);
-      for ($i=0; $i<$n; $i++) {
+      $n = floor($v_header['size'] / 512);
+      for ($i = 0; $i < $n; $i++) {
         $v_content = $this->_readBlock();
         $v_filename .= $v_content;
       }
@@ -320,7 +320,7 @@ 
     protected function _extractList($p_path, &$p_list_detail, $p_mode,
 	                      $p_file_list, $p_remove_path)
     {
-    $v_result=true;
+    $v_result = true;
     $v_nb = 0;
     $v_extract_all = true;
     $v_listing = false;
@@ -328,7 +328,7 @@ 
     $p_path = $this->_translateWinPath($p_path, false);
     if ($p_path == '' || (substr($p_path, 0, 1) != '/'
 	    && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-      $p_path = "./".$p_path;
+      $p_path = "./" . $p_path;
     }
     $p_remove_path = $this->_translateWinPath($p_remove_path);
 
@@ -351,7 +351,7 @@ 
           $v_listing = true;
       break;
       default :
-        $this->_error('Invalid extract mode ('.$p_mode.')');
+        $this->_error('Invalid extract mode (' . $p_mode . ')');
         return false;
     }
 
@@ -379,7 +379,7 @@ 
         // ----- By default no unzip if the file is not found
         $v_extract_file = false;
 
-        for ($i=0; $i<sizeof($p_file_list); $i++) {
+        for ($i = 0; $i < sizeof($p_file_list); $i++) {
           // ----- Look if it is a directory
           if (substr($p_file_list[$i], -1) == '/') {
             // ----- Look if the directory is in the filename path
@@ -411,28 +411,28 @@ 
 		                                 $p_remove_path_size);
         if (($p_path != './') && ($p_path != '/')) {
           while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
+            $p_path = substr($p_path, 0, strlen($p_path) - 1);
 
           if (substr($v_header['filename'], 0, 1) == '/')
-              $v_header['filename'] = $p_path.$v_header['filename'];
+              $v_header['filename'] = $p_path . $v_header['filename'];
           else
-            $v_header['filename'] = $p_path.'/'.$v_header['filename'];
+            $v_header['filename'] = $p_path . '/' . $v_header['filename'];
         }
         if (file_exists($v_header['filename'])) {
-          if (   (@is_dir($v_header['filename']))
+          if ((@is_dir($v_header['filename']))
 		      && ($v_header['typeflag'] == '')) {
-            $this->_error('File '.$v_header['filename']
+            $this->_error('File ' . $v_header['filename']
 			              .' already exists as a directory');
             return false;
           }
-          if (   ($this->_isArchive($v_header['filename']))
+          if (($this->_isArchive($v_header['filename']))
 		      && ($v_header['typeflag'] == "5")) {
-            $this->_error('Directory '.$v_header['filename']
+            $this->_error('Directory ' . $v_header['filename']
 			              .' already exists as a file');
             return false;
           }
           if (!is_writeable($v_header['filename'])) {
-            $this->_error('File '.$v_header['filename']
+            $this->_error('File ' . $v_header['filename']
 			              .' already exists and is write protected');
             return false;
           }
@@ -444,9 +444,9 @@ 
         // ----- Check the directory availability and create it if necessary
         elseif (($v_result
 		         = $this->_dirCheck(($v_header['typeflag'] == "5"
-				                    ?$v_header['filename']
+				                    ? $v_header['filename']
 									:dirname($v_header['filename'])))) != 1) {
-            $this->_error('Unable to create path for '.$v_header['filename']);
+            $this->_error('Unable to create path for ' . $v_header['filename']);
             return false;
         }
 
@@ -455,19 +455,19 @@ 
             if (!@file_exists($v_header['filename'])) {
                 if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
                     $this->_error('Unable to create directory {'
-					              .$v_header['filename'].'}');
+					              .$v_header['filename'] . '}');
                     return false;
                 }
                 chmod($v_header['filename'], PRADO_CHMOD);
             }
           } else {
               if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-                  $this->_error('Error while opening {'.$v_header['filename']
+                  $this->_error('Error while opening {' . $v_header['filename']
 				                .'} in write binary mode');
                   return false;
               } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
+                  $n = floor($v_header['size'] / 512);
+                  for ($i = 0; $i < $n; $i++) {
                       $v_content = $this->_readBlock();
                       fwrite($v_dest_file, $v_content, 512);
                   }
@@ -487,19 +487,19 @@ 
           // ----- Check the file size
           clearstatcache();
           if (filesize($v_header['filename']) != $v_header['size']) {
-              $this->_error('Extracted file '.$v_header['filename']
+              $this->_error('Extracted file ' . $v_header['filename']
 			                .' does not have the correct file size \''
 							.filesize($v_header['filename'])
-							.'\' ('.$v_header['size']
+							.'\' (' . $v_header['size']
 							.' expected). Archive may be corrupted.');
               return false;
           }
           }
         } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
+          $this->_jumpBlock(ceil(($v_header['size'] / 512)));
         }
       } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
+          $this->_jumpBlock(ceil(($v_header['size'] / 512)));
       }
 
       /* TBC : Seems to be unused ...
@@ -548,21 +548,21 @@ 
             $this->_error("Unable to create directory '$p_dir'");
             return false;
         }
-        chmod($p_dir,PRADO_CHMOD);
+        chmod($p_dir, PRADO_CHMOD);
 
         return true;
     }
 
-    protected function _translateWinPath($p_path, $p_remove_disk_letter=true)
+    protected function _translateWinPath($p_path, $p_remove_disk_letter = true)
     {
       if (substr(PHP_OS, 0, 3) == 'WIN') {
           // ----- Look for potential disk letter
-          if (   ($p_remove_disk_letter)
+          if (($p_remove_disk_letter)
 		      && (($v_position = strpos($p_path, ':')) != false)) {
-              $p_path = substr($p_path, $v_position+1);
+              $p_path = substr($p_path, $v_position + 1);
           }
           // ----- Change potential windows directory separator
-          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
               $p_path = strtr($p_path, '\\', '/');
           }
       }

Braces +15 added lines, -10 removed lines

@@ -155,8 +155,9 @@ 
                 $this->_temp_tarname = '';
                 return false;
               }
-              while ($v_data = @fread($v_file_from, 1024))
-                  @fwrite($v_file_to, $v_data);
+              while ($v_data = @fread($v_file_from, 1024)) {
+                                @fwrite($v_file_to, $v_data);
+              }
               @fclose($v_file_from);
               @fclose($v_file_to);
           }
@@ -251,14 +252,17 @@ 
         // ----- Calculate the checksum
         $v_checksum = 0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i=0; $i<148; $i++) {
+                    $v_checksum+=ord(substr($v_binary_data,$i,1));
+        }
         // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
+        for ($i=148; $i<156; $i++) {
+                    $v_checksum += ord(' ');
+        }
         // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i=156; $i<512; $i++) {
+                   $v_checksum+=ord(substr($v_binary_data,$i,1));
+        }
 
         $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
 		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
@@ -410,8 +414,9 @@ 
           $v_header['filename'] = substr($v_header['filename'],
 		                                 $p_remove_path_size);
         if (($p_path != './') && ($p_path != '/')) {
-          while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
+          while (substr($p_path, -1) == '/') {
+                      $p_path = substr($p_path, 0, strlen($p_path)-1);
+          }
 
           if (substr($v_header['filename'], 0, 1) == '/')
               $v_header['filename'] = $p_path.$v_header['filename'];

framework/PradoBase.php

Doc Comments +1 added lines

@@ -184,6 +184,7 @@
 	 * will cause the throw of an exception.
 	 * This method should only be used by framework developers.
 	 * @param TApplication the application instance
+	 * @param TApplication $application
 	 * @throws TInvalidOperationException if this method is invoked twice or more.
 	 */
 	public static function setApplication($application)

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 if(!defined('PRADO_DIR'))
 	define('PRADO_DIR',dirname(__FILE__));
 /**
- * Defines the default permission for writable directories and files
- */
+	 * Defines the default permission for writable directories and files
+	 */
 if(!defined('PRADO_CHMOD'))
 	define('PRADO_CHMOD',0777);
 

Braces +17 added lines, -26 removed lines

@@ -116,8 +116,7 @@ 
 		{
 			$am=self::$_application->getAssetManager();
 			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
-		}
-		else
+		} else
 			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
 		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
@@ -169,8 +168,7 @@ 
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
 			$errorHandler->handleError(null,$exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -253,14 +251,14 @@ 
 				break;
 				default:
 					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
-						$s.=",\$args[$i]";
+					for($i=2;$i<$n;++$i) {
+											$s.=",\$args[$i]";
+					}
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
 			}
-		}
-		else
+		} else
 			return new $type;
 	}
 
@@ -282,24 +280,21 @@ 
 			try
 			{
 				include_once($namespace.self::CLASS_FILE_EXT);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				if($checkClassExistence && !class_exists($namespace,false))
 					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
 				else
 					throw $e;
 			}
-		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		} else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
 		{
 			$className=substr($namespace,$pos+1);
 			if($className==='*')  // a directory
 			{
 				self::$_usings[$namespace]=$path;
 				set_include_path(get_include_path().PATH_SEPARATOR.$path);
-			}
-			else  // a file
+			} else  // a file
 			{
 				self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || !class_exists($className,false))
@@ -307,8 +302,7 @@ 
 					try
 					{
 						include_once($path);
-					}
-					catch(Exception $e)
+					} catch(Exception $e)
 					{
 						if($checkClassExistence && !class_exists($className,false))
 							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
@@ -317,8 +311,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
 	}
 
@@ -384,8 +377,7 @@ 
 				self::$_aliases[$alias]=$rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
 	}
 
@@ -430,8 +422,7 @@ 
 							echo "'". substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
-					}
-					else if (is_int($item) || is_float($item))
+					} else if (is_int($item) || is_float($item))
 						echo $item;
 					else if (is_object($item))
 						echo get_class($item);
@@ -526,8 +517,7 @@ 
 			if(isset($trace[0]['file']) && isset($trace[0]['line']))
 				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
 			$level=TLogger::DEBUG;
-		}
-		else
+		} else
 			$level=TLogger::INFO;
 		self::log($msg,$level,$category,$ctl);
 	}
@@ -592,8 +582,9 @@ 
 		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = array();
-		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
+		foreach($parameters as $key => $value) {
+					$params['{'.$key.'}'] = $value;
+		}
 
 		//no translation handler provided
 		if($app===null || ($config = $app->getTranslationConfiguration())===null)

Spacing +132 added lines, -132 removed lines

@@ -15,13 +15,13 @@ 
 /**
  * Defines the PRADO framework installation path.
  */
-if(!defined('PRADO_DIR'))
-	define('PRADO_DIR',dirname(__FILE__));
+if (!defined('PRADO_DIR'))
+	define('PRADO_DIR', dirname(__FILE__));
 /**
  * Defines the default permission for writable directories and files
  */
-if(!defined('PRADO_CHMOD'))
-	define('PRADO_CHMOD',0777);
+if (!defined('PRADO_CHMOD'))
+	define('PRADO_CHMOD', 0777);
 
 /**
  * PradoBase class.
@@ -41,23 +41,23 @@ 
 	/**
 	 * File extension for Prado class files.
 	 */
-	const CLASS_FILE_EXT='.php';
+	const CLASS_FILE_EXT = '.php';
 	/**
 	 * @var array list of path aliases
 	 */
-	private static $_aliases=array('System'=>PRADO_DIR);
+	private static $_aliases = array('System'=>PRADO_DIR);
 	/**
 	 * @var array list of namespaces currently in use
 	 */
-	private static $_usings=array();
+	private static $_usings = array();
 	/**
 	 * @var TApplication the application instance
 	 */
-	private static $_application=null;
+	private static $_application = null;
 	/**
 	 * @var TLogger logger instance
 	 */
-	private static $_logger=null;
+	private static $_logger = null;
 
 	/**
 	 * @var array list of class exists checks
@@ -82,15 +82,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(array('PradoBase','phpErrorHandler'));
+		set_error_handler(array('PradoBase', 'phpErrorHandler'));
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(array('PradoBase','phpFatalErrorHandler'));
+		register_shutdown_function(array('PradoBase', 'phpFatalErrorHandler'));
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(array('PradoBase','exceptionHandler'));
+		set_exception_handler(array('PradoBase', 'exceptionHandler'));
 		/**
 		 * Disable php's builtin error reporting to avoid duplicated reports
 		 */
@@ -104,24 +104,24 @@ 
 	 */
 	public static function autoload($className)
 	{
-		@include_once($className.self::CLASS_FILE_EXT);
+		@include_once($className . self::CLASS_FILE_EXT);
 	}
 
 	/**
 	 * @param integer the type of "powered logo". Valid values include 0 and 1.
 	 * @return string a string that can be displayed on your Web page showing powered-by-PRADO information
 	 */
-	public static function poweredByPrado($logoType=0)
+	public static function poweredByPrado($logoType = 0)
 	{
-		$logoName=$logoType==1?'powered2':'powered';
-		if(self::$_application!==null)
+		$logoName = $logoType == 1 ? 'powered2' : 'powered';
+		if (self::$_application !== null)
 		{
-			$am=self::$_application->getAssetManager();
-			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
+			$am = self::$_application->getAssetManager();
+			$url = $am->publishFilePath(self::getPathOfNamespace('System.' . $logoName, '.gif'));
 		}
 		else
-			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
-		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
+			$url = 'http://pradosoft.github.io/docs/' . $logoName . '.gif';
+		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="' . $url . '" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
 
 	/**
@@ -134,10 +134,10 @@ 
 	 * @param string the filename that the error was raised in
 	 * @param integer the line number the error was raised at
 	 */
-	public static function phpErrorHandler($errno,$errstr,$errfile,$errline)
+	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
-		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+		if (error_reporting() & $errno)
+			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 	}
 
 	/**
@@ -149,11 +149,11 @@ 
 	public static function phpFatalErrorHandler()
 	{
 		$error = error_get_last();
-		if($error && 
+		if ($error && 
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type'])
 		{
-			self::exceptionHandler(new TPhpErrorException($error['type'],$error['message'],$error['file'],$error['line']));
+			self::exceptionHandler(new TPhpErrorException($error['type'], $error['message'], $error['file'], $error['line']));
 		}
 	}
 
@@ -168,9 +168,9 @@ 
 	 */
 	public static function exceptionHandler($exception)
 	{
-		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
+		if (self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
 		{
-			$errorHandler->handleError(null,$exception);
+			$errorHandler->handleError(null, $exception);
 		}
 		else
 		{
@@ -190,9 +190,9 @@ 
 	 */
 	public static function setApplication($application)
 	{
-		if(self::$_application!==null && !defined('PRADO_TEST_RUN'))
+		if (self::$_application !== null && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_application_singleton_required');
-		self::$_application=$application;
+		self::$_application = $application;
 	}
 
 	/**
@@ -226,21 +226,21 @@ 
 	 */
 	public static function createComponent($type)
 	{
-		if(!isset(self::$classExists[$type]))
+		if (!isset(self::$classExists[$type]))
 			self::$classExists[$type] = class_exists($type, false);
 
-		if( !isset(self::$_usings[$type]) && !self::$classExists[$type]) {
+		if (!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			self::using($type);
 			self::$classExists[$type] = class_exists($type, false);
 		}
 
-		if( ($pos = strrpos($type, '.')) !== false)
-			$type = substr($type,$pos+1);
+		if (($pos = strrpos($type, '.')) !== false)
+			$type = substr($type, $pos + 1);
 
-		if(($n=func_num_args())>1)
+		if (($n = func_num_args()) > 1)
 		{
 			$args = func_get_args();
-			switch($n) {
+			switch ($n) {
 				case 2:
 					return new $type($args[1]);
 				break;
@@ -254,9 +254,9 @@ 
 					return new $type($args[1], $args[2], $args[3], $args[4]);
 				break;
 				default:
-					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
-						$s.=",\$args[$i]";
+					$s = '$args[1]';
+					for ($i = 2; $i < $n; ++$i)
+						$s .= ",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
@@ -275,45 +275,45 @@ 
 	 * @param boolean whether to check the existence of the class after the class file is included
 	 * @throws TInvalidDataValueException if the namespace is invalid
 	 */
-	public static function using($namespace,$checkClassExistence=true)
+	public static function using($namespace, $checkClassExistence = true)
 	{
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false))
+		if (isset(self::$_usings[$namespace]) || class_exists($namespace, false))
 			return;
-		if(($pos=strrpos($namespace,'.'))===false)  // a class name
+		if (($pos = strrpos($namespace, '.')) === false)  // a class name
 		{
 			try
 			{
-				include_once($namespace.self::CLASS_FILE_EXT);
+				include_once($namespace . self::CLASS_FILE_EXT);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				if($checkClassExistence && !class_exists($namespace,false))
-					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
+				if ($checkClassExistence && !class_exists($namespace, false))
+					throw new TInvalidOperationException('prado_component_unknown', $namespace, $e->getMessage());
 				else
 					throw $e;
 			}
 		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		else if (($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null)
 		{
-			$className=substr($namespace,$pos+1);
-			if($className==='*')  // a directory
+			$className = substr($namespace, $pos + 1);
+			if ($className === '*')  // a directory
 			{
-				self::$_usings[$namespace]=$path;
-				set_include_path(get_include_path().PATH_SEPARATOR.$path);
+				self::$_usings[$namespace] = $path;
+				set_include_path(get_include_path() . PATH_SEPARATOR . $path);
 			}
 			else  // a file
 			{
-				self::$_usings[$namespace]=$path;
-				if(!$checkClassExistence || !class_exists($className,false))
+				self::$_usings[$namespace] = $path;
+				if (!$checkClassExistence || !class_exists($className, false))
 				{
 					try
 					{
 						include_once($path);
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className,false))
-							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
+						if ($checkClassExistence && !class_exists($className, false))
+							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						else
 							throw $e;
 					}
@@ -321,7 +321,7 @@ 
 			}
 		}
 		else
-			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
+			throw new TInvalidDataValueException('prado_using_invalid', $namespace);
 	}
 
 	/**
@@ -336,22 +336,22 @@ 
 	 * @param string extension to be appended if the namespace refers to a file
 	 * @return string file path corresponding to the namespace, null if namespace is invalid
 	 */
-	public static function getPathOfNamespace($namespace, $ext='')
+	public static function getPathOfNamespace($namespace, $ext = '')
 	{
-		if(self::CLASS_FILE_EXT === $ext || empty($ext))
+		if (self::CLASS_FILE_EXT === $ext || empty($ext))
 		{
-			if(isset(self::$_usings[$namespace]))
+			if (isset(self::$_usings[$namespace]))
 				return self::$_usings[$namespace];
 
-			if(isset(self::$_aliases[$namespace]))
+			if (isset(self::$_aliases[$namespace]))
 				return self::$_aliases[$namespace];
 		}
 
-		$segs = explode('.',$namespace);
+		$segs = explode('.', $namespace);
 		$alias = array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		if (null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
+			return rtrim($root . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $segs), '/\\') . (($file === '*') ? '' : DIRECTORY_SEPARATOR . $file . $ext);
 
 		return null;
 	}
@@ -362,7 +362,7 @@ 
 	 */
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ?self::$_aliases[$alias] : null;
 	}
 
 	protected static function getPathAliases()
@@ -376,19 +376,19 @@ 
 	 * @throws TInvalidOperationException if the alias is already defined
 	 * @throws TInvalidDataValueException if the path is not a valid file path
 	 */
-	public static function setPathOfAlias($alias,$path)
+	public static function setPathOfAlias($alias, $path)
 	{
-		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined',$alias);
-		else if(($rp=realpath($path))!==false && is_dir($rp))
+		if (isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
+			throw new TInvalidOperationException('prado_alias_redefined', $alias);
+		else if (($rp = realpath($path)) !== false && is_dir($rp))
 		{
-			if(strpos($alias,'.')===false)
-				self::$_aliases[$alias]=$rp;
+			if (strpos($alias, '.') === false)
+				self::$_aliases[$alias] = $rp;
 			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
 		}
 		else
-			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
+			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
 	/**
@@ -400,36 +400,36 @@ 
 	public static function fatalError($msg)
 	{
 		echo '<h1>Fatal Error</h1>';
-		echo '<p>'.$msg.'</p>';
-		if(!function_exists('debug_backtrace'))
+		echo '<p>' . $msg . '</p>';
+		if (!function_exists('debug_backtrace'))
 			return;
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
-		$index=-1;
-		foreach(debug_backtrace() as $t)
+		$index = -1;
+		foreach (debug_backtrace() as $t)
 		{
 			$index++;
-			if($index==0)  // hide the backtrace of this function
+			if ($index == 0)  // hide the backtrace of this function
 				continue;
-			echo '#'.$index.' ';
-			if(isset($t['file']))
+			echo '#' . $index . ' ';
+			if (isset($t['file']))
 				echo basename($t['file']) . ':' . $t['line'];
 			else
 				 echo '<PHP inner-code>';
 			echo ' -- ';
-			if(isset($t['class']))
+			if (isset($t['class']))
 				echo $t['class'] . $t['type'];
 			echo $t['function'] . '(';
-			if(isset($t['args']) && sizeof($t['args']) > 0)
+			if (isset($t['args']) && sizeof($t['args']) > 0)
 			{
-				$count=0;
-				foreach($t['args'] as $item)
+				$count = 0;
+				foreach ($t['args'] as $item)
 				{
-					if(is_string($item))
+					if (is_string($item))
 					{
-						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
+						$str = htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
 						if (strlen($item) > 70)
-							echo "'". substr($str, 0, 70) . "...'";
+							echo "'" . substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
 					}
@@ -465,23 +465,23 @@ 
 	 */
 	public static function getUserLanguages()
 	{
-		static $languages=null;
-		if($languages===null)
+		static $languages = null;
+		if ($languages === null)
 		{
-			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-				$languages[0]='en';
+			if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+				$languages[0] = 'en';
 			else
 			{
-				$languages=array();
-				foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+				$languages = array();
+				foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
-					$array=explode(';q=',trim($language));
-					$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
+					$array = explode(';q=', trim($language));
+					$languages[trim($array[0])] = isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
-				$languages=array_keys($languages);
-				if(empty($languages))
-					$languages[0]='en';
+				$languages = array_keys($languages);
+				if (empty($languages))
+					$languages[0] = 'en';
 			}
 		}
 		return $languages;
@@ -493,15 +493,15 @@ 
 	 */
 	public static function getPreferredLanguage()
 	{
-		static $language=null;
-		if($language===null)
+		static $language = null;
+		if ($language === null)
 		{
-			$langs=Prado::getUserLanguages();
-			$lang=explode('-',$langs[0]);
-			if(empty($lang[0]) || !ctype_alpha($lang[0]))
-				$language='en';
+			$langs = Prado::getUserLanguages();
+			$lang = explode('-', $langs[0]);
+			if (empty($lang[0]) || !ctype_alpha($lang[0]))
+				$language = 'en';
 			else
-				$language=$lang[0];
+				$language = $lang[0];
 		}
 		return $language;
 	}
@@ -518,20 +518,20 @@ 
 	 * @param (string|TControl) control of the message
 	 * @see log, getLogger
 	 */
-	public static function trace($msg,$category='Uncategorized',$ctl=null)
+	public static function trace($msg, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
+		if (self::$_application && self::$_application->getMode() === TApplicationMode::Performance)
 			return;
-		if(!self::$_application || self::$_application->getMode()===TApplicationMode::Debug)
+		if (!self::$_application || self::$_application->getMode() === TApplicationMode::Debug)
 		{
-			$trace=debug_backtrace();
-			if(isset($trace[0]['file']) && isset($trace[0]['line']))
-				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
-			$level=TLogger::DEBUG;
+			$trace = debug_backtrace();
+			if (isset($trace[0]['file']) && isset($trace[0]['line']))
+				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
+			$level = TLogger::DEBUG;
 		}
 		else
-			$level=TLogger::INFO;
-		self::log($msg,$level,$category,$ctl);
+			$level = TLogger::INFO;
+		self::log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -546,11 +546,11 @@ 
 	 * @param string category of the message
 	 * @param (string|TControl) control of the message
 	 */
-	public static function log($msg,$level=TLogger::INFO,$category='Uncategorized',$ctl=null)
+	public static function log($msg, $level = TLogger::INFO, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_logger===null)
-			self::$_logger=new TLogger;
-		self::$_logger->log($msg,$level,$category,$ctl);
+		if (self::$_logger === null)
+			self::$_logger = new TLogger;
+		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -558,8 +558,8 @@ 
 	 */
 	public static function getLogger()
 	{
-		if(self::$_logger===null)
-			self::$_logger=new TLogger;
+		if (self::$_logger === null)
+			self::$_logger = new TLogger;
 		return self::$_logger;
 	}
 
@@ -572,10 +572,10 @@ 
 	 * @param boolean whether to syntax highlight the output. Defaults to false.
 	 * @return string the string representation of the variable
 	 */
-	public static function varDump($var,$depth=10,$highlight=false)
+	public static function varDump($var, $depth = 10, $highlight = false)
 	{
 		Prado::using('System.Util.TVarDumper');
-		return TVarDumper::dump($var,$depth,$highlight);
+		return TVarDumper::dump($var, $depth, $highlight);
 	}
 
 	/**
@@ -588,35 +588,35 @@ 
 	 * @see TTranslate::formatter()
 	 * @see TTranslate::init()
 	 */
-	public static function localize($text, $parameters=array(), $catalogue=null, $charset=null)
+	public static function localize($text, $parameters = array(), $catalogue = null, $charset = null)
 	{
 		Prado::using('System.I18N.Translation');
 		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = array();
-		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
+		foreach ($parameters as $key => $value)
+			$params['{' . $key . '}'] = $value;
 
 		//no translation handler provided
-		if($app===null || ($config = $app->getTranslationConfiguration())===null)
+		if ($app === null || ($config = $app->getTranslationConfiguration()) === null)
 			return strtr($text, $params);
 
-		if ($catalogue===null)
-			$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		if ($catalogue === null)
+			$catalogue = isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 
 		Translation::init($catalogue);
 
 		//globalization charset
-		$appCharset = $app===null ? '' : $app->getCharset();
+		$appCharset = $app === null ? '' : $app->getCharset();
 
 		//default charset
-		$defaultCharset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
+		$defaultCharset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if (empty($charset)) $charset = $appCharset;
+		if (empty($charset)) $charset = $defaultCharset;
 
-		return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
+		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}
 }
 

framework/Security/TAuthorizationRule.php

Doc Comments +9 added lines

@@ -219,11 +219,17 @@ 
 		return 0;
 	}
 
+	/**
+	 * @param IUser $user
+	 */
 	private function isUserMatched($user)
 	{
 		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()),$this->_users));
 	}
 
+	/**
+	 * @param IUser $user
+	 */
 	private function isRoleMatched($user)
 	{
 		foreach($this->_roles as $role)
@@ -256,6 +262,9 @@ 
 	 * @param IUser the user to be authorized
 	 * @param string verb, can be empty, 'post' or 'get'.
 	 * @param string the request IP address
+	 * @param IUser $user
+	 * @param string $verb
+	 * @param string $ip
 	 * @return boolean whether the user is allowed
 	 */
 	public function isUserAllowed($user,$verb,$ip)

Spacing +56 added lines, -56 removed lines

@@ -70,61 +70,61 @@ 
 	 * @param string verb, can be empty, 'get', or 'post'
 	 * @param string IP rules (separated by comma, can contain wild card *)
 	 */
-	public function __construct($action,$users,$roles,$verb='',$ipRules='')
+	public function __construct($action, $users, $roles, $verb = '', $ipRules = '')
 	{
-		$action=strtolower(trim($action));
-		if($action==='allow' || $action==='deny')
-			$this->_action=$action;
+		$action = strtolower(trim($action));
+		if ($action === 'allow' || $action === 'deny')
+			$this->_action = $action;
 		else
-			throw new TInvalidDataValueException('authorizationrule_action_invalid',$action);
-		$this->_users=array();
-		$this->_roles=array();
-		$this->_ipRules=array();
-		$this->_everyone=false;
-		$this->_guest=false;
-		$this->_authenticated=false;
+			throw new TInvalidDataValueException('authorizationrule_action_invalid', $action);
+		$this->_users = array();
+		$this->_roles = array();
+		$this->_ipRules = array();
+		$this->_everyone = false;
+		$this->_guest = false;
+		$this->_authenticated = false;
 
-		if(trim($users)==='')
-			$users='*';
-		foreach(explode(',',$users) as $user)
+		if (trim($users) === '')
+			$users = '*';
+		foreach (explode(',', $users) as $user)
 		{
-			if(($user=trim(strtolower($user)))!=='')
+			if (($user = trim(strtolower($user))) !== '')
 			{
-				if($user==='*')
+				if ($user === '*')
 				{
-					$this->_everyone=true;
+					$this->_everyone = true;
 					break;
 				}
-				else if($user==='?')
-					$this->_guest=true;
-				else if($user==='@')
-					$this->_authenticated=true;
+				else if ($user === '?')
+					$this->_guest = true;
+				else if ($user === '@')
+					$this->_authenticated = true;
 				else
-					$this->_users[]=$user;
+					$this->_users[] = $user;
 			}
 		}
 
-		if(trim($roles)==='')
-			$roles='*';
-		foreach(explode(',',$roles) as $role)
+		if (trim($roles) === '')
+			$roles = '*';
+		foreach (explode(',', $roles) as $role)
 		{
-			if(($role=trim(strtolower($role)))!=='')
-				$this->_roles[]=$role;
+			if (($role = trim(strtolower($role))) !== '')
+				$this->_roles[] = $role;
 		}
 
-		if(($verb=trim(strtolower($verb)))==='')
-			$verb='*';
-		if($verb==='*' || $verb==='get' || $verb==='post')
-			$this->_verb=$verb;
+		if (($verb = trim(strtolower($verb))) === '')
+			$verb = '*';
+		if ($verb === '*' || $verb === 'get' || $verb === 'post')
+			$this->_verb = $verb;
 		else
-			throw new TInvalidDataValueException('authorizationrule_verb_invalid',$verb);
+			throw new TInvalidDataValueException('authorizationrule_verb_invalid', $verb);
 
-		if(trim($ipRules)==='')
-			$ipRules='*';
-		foreach(explode(',',$ipRules) as $ipRule)
+		if (trim($ipRules) === '')
+			$ipRules = '*';
+		foreach (explode(',', $ipRules) as $ipRule)
 		{
-			if(($ipRule=trim($ipRule))!=='')
-				$this->_ipRules[]=$ipRule;
+			if (($ipRule = trim($ipRule)) !== '')
+				$this->_ipRules[] = $ipRule;
 		}
 	}
 
@@ -199,21 +199,21 @@ 
 	 * @param string the request IP address
 	 * @return integer 1 if the user is allowed, -1 if the user is denied, 0 if the rule does not apply to the user
 	 */
-	public function isUserAllowed(IUser $user,$verb,$ip)
+	public function isUserAllowed(IUser $user, $verb, $ip)
 	{
-		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action==='allow')?1:-1;
+		if ($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
+			return ($this->_action === 'allow') ? 1 : -1;
 		else
 			return 0;
 	}
 
 	private function isIpMatched($ip)
 	{
-		if(empty($this->_ipRules))
+		if (empty($this->_ipRules))
 			return 1;
-		foreach($this->_ipRules as $rule)
+		foreach ($this->_ipRules as $rule)
 		{
-			if($rule==='*' || $rule===$ip || (($pos=strpos($rule,'*'))!==false && strncmp($ip,$rule,$pos)===0))
+			if ($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && strncmp($ip, $rule, $pos) === 0))
 				return 1;
 		}
 		return 0;
@@ -221,14 +221,14 @@ 
 
 	private function isUserMatched($user)
 	{
-		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()),$this->_users));
+		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()), $this->_users));
 	}
 
 	private function isRoleMatched($user)
 	{
-		foreach($this->_roles as $role)
+		foreach ($this->_roles as $role)
 		{
-			if($role==='*' || $user->isInRole($role))
+			if ($role === '*' || $user->isInRole($role))
 				return true;
 		}
 		return false;
@@ -236,7 +236,7 @@ 
 
 	private function isVerbMatched($verb)
 	{
-		return ($this->_verb==='*' || strcasecmp($verb,$this->_verb)===0);
+		return ($this->_verb === '*' || strcasecmp($verb, $this->_verb) === 0);
 	}
 }
 
@@ -258,15 +258,15 @@ 
 	 * @param string the request IP address
 	 * @return boolean whether the user is allowed
 	 */
-	public function isUserAllowed($user,$verb,$ip)
+	public function isUserAllowed($user, $verb, $ip)
 	{
-		if($user instanceof IUser)
+		if ($user instanceof IUser)
 		{
-			$verb=strtolower(trim($verb));
-			foreach($this as $rule)
+			$verb = strtolower(trim($verb));
+			foreach ($this as $rule)
 			{
-				if(($decision=$rule->isUserAllowed($user,$verb,$ip))!==0)
-					return ($decision>0);
+				if (($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
+					return ($decision > 0);
 			}
 			return true;
 		}
@@ -282,10 +282,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TAuthorizationRule object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TAuthorizationRule)
-			parent::insertAt($index,$item);
+		if ($item instanceof TAuthorizationRule)
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
 	}

Braces +2 added lines, -4 removed lines

@@ -94,8 +94,7 @@ 
 				{
 					$this->_everyone=true;
 					break;
-				}
-				else if($user==='?')
+				} else if($user==='?')
 					$this->_guest=true;
 				else if($user==='@')
 					$this->_authenticated=true;
@@ -269,8 +268,7 @@ 
 					return ($decision>0);
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Security/TDbUserManager.php

Doc Comments +1 added lines

@@ -163,6 +163,7 @@
 	/**
 	 * Creates the DB connection.
 	 * @param string the module ID for TDataSourceConfig
+	 * @param string $connectionID
 	 * @return TDbConnection the created DB connection
 	 * @throws TConfigurationException if module ID is invalid or empty
 	 */

Spacing +31 added lines, -31 removed lines

@@ -48,10 +48,10 @@ 
  */
 class TDbUserManager extends TModule implements IUserManager
 {
-	private $_connID='';
+	private $_connID = '';
 	private $_conn;
-	private $_guestName='Guest';
-	private $_userClass='';
+	private $_guestName = 'Guest';
+	private $_userClass = '';
 	private $_userFactory;
 
 	/**
@@ -61,11 +61,11 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userClass==='')
+		if ($this->_userClass === '')
 			throw new TConfigurationException('dbusermanager_userclass_required');
-		$this->_userFactory=Prado::createComponent($this->_userClass,$this);
-		if(!($this->_userFactory instanceof TDbUser))
-			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid',$this->_userClass);
+		$this->_userFactory = Prado::createComponent($this->_userClass, $this);
+		if (!($this->_userFactory instanceof TDbUser))
+			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 */
 	public function setUserClass($value)
 	{
-		$this->_userClass=$value;
+		$this->_userClass = $value;
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	public function setGuestName($value)
 	{
-		$this->_guestName=$value;
+		$this->_guestName = $value;
 	}
 
 	/**
@@ -106,9 +106,9 @@ 
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password)
+	public function validateUser($username, $password)
 	{
-		return $this->_userFactory->validateUser($username,$password);
+		return $this->_userFactory->validateUser($username, $password);
 	}
 
 	/**
@@ -116,11 +116,11 @@ 
 	 * @param string user name, null if it is a guest.
 	 * @return TUser the user instance, null if the specified username is not in the user database.
 	 */
-	public function getUser($username=null)
+	public function getUser($username = null)
 	{
-		if($username===null)
+		if ($username === null)
 		{
-			$user=Prado::createComponent($this->_userClass,$this);
+			$user = Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
 			return $user;
 		}
@@ -144,7 +144,7 @@ 
 	 */
 	public function setConnectionID($value)
 	{
-		$this->_connID=$value;
+		$this->_connID = $value;
 	}
 
 	/**
@@ -152,9 +152,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn===null)
+		if ($this->_conn === null)
 		{
-			$this->_conn=$this->createDbConnection($this->_connID);
+			$this->_conn = $this->createDbConnection($this->_connID);
 			$this->_conn->setActive(true);
 		}
 		return $this->_conn;
@@ -168,13 +168,13 @@ 
 	 */
 	protected function createDbConnection($connectionID)
 	{
-		if($connectionID!=='')
+		if ($connectionID !== '')
 		{
-			$conn=$this->getApplication()->getModule($connectionID);
-			if($conn instanceof TDataSourceConfig)
+			$conn = $this->getApplication()->getModule($connectionID);
+			if ($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
-				throw new TConfigurationException('dbusermanager_connectionid_invalid',$connectionID);
+				throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
 		}
 		else
 			throw new TConfigurationException('dbusermanager_connectionid_required');
@@ -198,8 +198,8 @@ 
 	 */
 	public function saveUserToCookie($cookie)
 	{
-		$user=$this->getApplication()->getUser();
-		if($user instanceof TDbUser)
+		$user = $this->getApplication()->getUser();
+		if ($user instanceof TDbUser)
 			$user->saveUserToCookie($cookie);
 	}
 }
@@ -228,19 +228,19 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_connection===null)
+		if ($this->_connection === null)
 		{
-			$userManager=$this->getManager();
-			if($userManager instanceof TDbUserManager)
+			$userManager = $this->getManager();
+			if ($userManager instanceof TDbUserManager)
 			{
-				$connection=$userManager->getDbConnection();
-				if($connection instanceof TDbConnection)
+				$connection = $userManager->getDbConnection();
+				if ($connection instanceof TDbConnection)
 				{
 					$connection->setActive(true);
-					$this->_connection=$connection;
+					$this->_connection = $connection;
 				}
 			}
-			if($this->_connection===null)
+			if ($this->_connection === null)
 				throw new TConfigurationException('dbuser_dbconnection_invalid');
 		}
 		return $this->_connection;
@@ -255,7 +255,7 @@ 
 	 * @param string password
 	 * @return boolean whether the validation succeeds
 	 */
-	abstract public function validateUser($username,$password);
+	abstract public function validateUser($username, $password);
 
 	/**
 	 * Creates a new user instance given the username.

Braces +2 added lines, -4 removed lines

@@ -123,8 +123,7 @@ 
 			$user=Prado::createComponent($this->_userClass,$this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 			return $this->_userFactory->createUser($username);
 	}
 
@@ -175,8 +174,7 @@ 
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('dbusermanager_connectionid_invalid',$connectionID);
-		}
-		else
+		} else
 			throw new TConfigurationException('dbusermanager_connectionid_required');
 	}
 

framework/TApplication.php

Doc Comments +10 added lines, -1 removed lines

@@ -342,6 +342,7 @@ 
 	 * to determine the application configuration file,
 	 * application root path and the runtime path.
 	 * @param string the application root path or the application configuration file
+	 * @param string $basePath
 	 * @see setBasePath
 	 * @see setRuntimePath
 	 * @see setConfigurationFile
@@ -440,6 +441,7 @@ 
 	 * A global value is one that is persistent across users sessions and requests.
 	 * @param string the name of the value to be returned
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
+	 * @param integer $defaultValue
 	 * @return mixed the global value corresponding to $key
 	 */
 	public function getGlobalState($key,$defaultValue=null)
@@ -456,6 +458,7 @@ 
 	 * @param mixed the global value to be set
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
+	 * @param string $key
 	 */
 	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
 	{
@@ -545,7 +548,7 @@ 
 	}
 
 	/**
-	 * @return TApplicationMode application mode. Defaults to TApplicationMode::Debug.
+	 * @return string application mode. Defaults to TApplicationMode::Debug.
 	 */
 	public function getMode()
 	{
@@ -570,6 +573,7 @@ 
 
 	/**
 	 * @param string the directory containing the application configuration file
+	 * @param string $value
 	 */
 	public function setBasePath($value)
 	{
@@ -586,6 +590,7 @@ 
 
 	/**
 	 * @param string the application configuration file (absolute path)
+	 * @param string $value
 	 */
 	public function setConfigurationFile($value)
 	{
@@ -602,6 +607,7 @@ 
 
  	/**
  	 * @param string the application configuration type. 'xml' and 'php' are valid values
+ 	 * @param string $value
 	 */
 	public function setConfigurationType($value)
 	{
@@ -657,6 +663,7 @@ 
 
 	/**
 	 * @param string the directory storing cache data and application-level persistent data. (absolute path)
+	 * @param string $value
 	 */
 	public function setRuntimePath($value)
 	{
@@ -677,6 +684,7 @@ 
 
 	/**
 	 * @param IService the currently requested service
+	 * @param IService $value
 	 */
 	public function setService($value)
 	{
@@ -1126,6 +1134,7 @@ 
 	 * This method is invoked when an exception is raised during the lifecycles
 	 * of the application.
 	 * @param mixed event parameter
+	 * @param Exception $param
 	 */
 	public function onError($param)
 	{

Indentation +1 added lines, -1 removed lines

@@ -602,7 +602,7 @@
 
  	/**
  	 * @param string the application configuration type. 'xml' and 'php' are valid values
-	 */
+ 	 */
 	public function setConfigurationType($value)
 	{
 		$this->_configType = $value;

Braces +34 added lines, -40 removed lines

@@ -357,8 +357,7 @@ 
 		{
 			$configFile=$basePath;
 			$basePath=dirname($configFile);
-		}
-		else
+		} else
 			$configFile=null;
 
 		// determine runtime path
@@ -378,8 +377,7 @@ 
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
-		}
-		else
+		} else
 			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
 
 	}
@@ -408,8 +406,7 @@ 
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -986,16 +983,19 @@ 
 			return;
 
 		// set path aliases and using namespaces
-		foreach($config->getAliases() as $alias=>$path)
-			Prado::setPathOfAlias($alias,$path);
-		foreach($config->getUsings() as $using)
-			Prado::using($using);
+		foreach($config->getAliases() as $alias=>$path) {
+					Prado::setPathOfAlias($alias,$path);
+		}
+		foreach($config->getUsings() as $using) {
+					Prado::using($using);
+		}
 
 		// set application properties
 		if(!$withinService)
 		{
-			foreach($config->getProperties() as $name=>$value)
-				$this->setSubProperty($name,$value);
+			foreach($config->getProperties() as $name=>$value) {
+							$this->setSubProperty($name,$value);
+			}
 		}
 
 		if(empty($this->_services))
@@ -1007,11 +1007,11 @@ 
 			if(is_array($parameter))
 			{
 				$component=Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name=>$value)
-					$component->setSubProperty($name,$value);
+				foreach($parameter[1] as $name=>$value) {
+									$component->setSubProperty($name,$value);
+				}
 				$this->_parameters->add($id,$component);
-			}
-			else
+			} else
 				$this->_parameters->add($id,$parameter);
 		}
 
@@ -1025,12 +1025,14 @@ 
 			if($module = $this->internalLoadModule($id))
 				$modules[]=$module;
 		}
-		foreach($modules as $module)
-			$module[0]->init($module[1]);
+		foreach($modules as $module) {
+					$module[0]->init($module[1]);
+		}
 
 		// load service
-		foreach($config->getServices() as $serviceID=>$serviceConfig)
-			$this->_services[$serviceID]=$serviceConfig;
+		foreach($config->getServices() as $serviceID=>$serviceConfig) {
+					$this->_services[$serviceID]=$serviceConfig;
+		}
 
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath=>$condition)
@@ -1070,8 +1072,7 @@ 
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile!==null)
 					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
-			}
-			else
+			} else
 				$config=unserialize(file_get_contents($this->_cacheFile));
 
 			$this->applyConfiguration($config,false);
@@ -1102,8 +1103,9 @@ 
 			$service->setID($serviceID);
 			$this->setService($service);
 
-			foreach($initProperties as $name=>$value)
-				$service->setSubProperty($name,$value);
+			foreach($initProperties as $name=>$value) {
+							$service->setSubProperty($name,$value);
+			}
 
 			if($configElement!==null)
 			{
@@ -1116,8 +1118,7 @@ 
 			}
 
 			$service->init($configElement);
-		}
-		else
+		} else
 			throw new THttpException(500,'application_service_unknown',$serviceID);
 	}
 
@@ -1346,8 +1347,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -1494,8 +1494,7 @@ 
 						if(isset($this->_aliases[$id]))
 							throw new TConfigurationException('appconfig_alias_redefined',$id);
 						$this->_aliases[$id]=$p;
-					}
-					else
+					} else
 						throw new TConfigurationException('appconfig_alias_invalid');
 					$this->_empty=false;
 					break;
@@ -1562,8 +1561,7 @@ 
 				else
 					$this->_modules[$id]=array($type,$properties->toArray(),$element);
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
 		}
 	}
@@ -1607,8 +1605,7 @@ 
 				$element->setParent(null);
 				$this->_services[$id]=array($type,$properties->toArray(),$element);
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
 		}
 	}
@@ -1632,8 +1629,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = array($type,$properties);
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -1660,12 +1656,10 @@ 
 						$this->_parameters[$id]=$element;
 					else
 						$this->_parameters[$id]=$value;
-				}
-				else
+				} else
 					$this->_parameters[$id]=array($type,$properties->toArray());
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
 		}
 	}

Spacing +354 added lines, -354 removed lines

@@ -12,7 +12,7 @@ 
 /**
  * Includes core interfaces essential for TApplication class
  */
-require_once(PRADO_DIR.'/interfaces.php');
+require_once(PRADO_DIR . '/interfaces.php');
 
 /**
  * Includes core classes essential for TApplication class
@@ -113,23 +113,23 @@ 
 	 * possible application mode.
 	 * @deprecated deprecated since version 3.0.4 (use TApplicationMode constants instead)
 	 */
-	const STATE_OFF='Off';
-	const STATE_DEBUG='Debug';
-	const STATE_NORMAL='Normal';
-	const STATE_PERFORMANCE='Performance';
+	const STATE_OFF = 'Off';
+	const STATE_DEBUG = 'Debug';
+	const STATE_NORMAL = 'Normal';
+	const STATE_PERFORMANCE = 'Performance';
 
 	/**
 	 * Page service ID
 	 */
-	const PAGE_SERVICE_ID='page';
+	const PAGE_SERVICE_ID = 'page';
 	/**
 	 * Application configuration file name
 	 */
-	const CONFIG_FILE_XML='application.xml';
+	const CONFIG_FILE_XML = 'application.xml';
 	/**
 	 * File extension for external config files
 	 */
-	const CONFIG_FILE_EXT_XML='.xml';
+	const CONFIG_FILE_EXT_XML = '.xml';
 	/**
 	 * Configuration file type, application.xml and config.xml
 	 */
@@ -137,11 +137,11 @@ 
 	/**
 	 * Application configuration file name
 	 */
-	const CONFIG_FILE_PHP='application.php';
+	const CONFIG_FILE_PHP = 'application.php';
 	/**
 	 * File extension for external config files
 	 */
-	const CONFIG_FILE_EXT_PHP='.php';
+	const CONFIG_FILE_EXT_PHP = '.php';
 	/**
 	 * Configuration file type, application.php and config.php
 	 */
@@ -149,20 +149,20 @@ 
 	/**
 	 * Runtime directory name
 	 */
-	const RUNTIME_PATH='runtime';
+	const RUNTIME_PATH = 'runtime';
 	/**
 	 * Config cache file
 	 */
-	const CONFIGCACHE_FILE='config.cache';
+	const CONFIGCACHE_FILE = 'config.cache';
 	/**
 	 * Global data file
 	 */
-	const GLOBAL_FILE='global.cache';
+	const GLOBAL_FILE = 'global.cache';
 
 	/**
 	 * @var array list of events that define application lifecycles
 	 */
-	private static $_steps=array(
+	private static $_steps = array(
 		'onBeginRequest',
 		'onLoadState',
 		'onLoadStateComplete',
@@ -189,7 +189,7 @@ 
 	/**
 	 * @var boolean whether the request is completed
 	 */
-	private $_requestCompleted=false;
+	private $_requestCompleted = false;
 	/**
 	 * @var integer application state
 	 */
@@ -205,11 +205,11 @@ 
 	/**
 	 * @var array list of loaded application modules
 	 */
-	private $_modules=array();
+	private $_modules = array();
 	/**
 	 * @var array list of application modules yet to be loaded
 	 */
-	private $_lazyModules=array();
+	private $_lazyModules = array();
 	/**
 	 * @var TMap list of application parameters
 	 */
@@ -237,11 +237,11 @@ 
 	/**
 	 * @var boolean if any global state is changed during the current request
 	 */
-	private $_stateChanged=false;
+	private $_stateChanged = false;
 	/**
 	 * @var array global variables (persistent across sessions, requests)
 	 */
-	private $_globals=array();
+	private $_globals = array();
 	/**
 	 * @var string cache file
 	 */
@@ -293,7 +293,7 @@ 
 	/**
 	 * @var TApplicationMode application mode
 	 */
-	private $_mode=TApplicationMode::Debug;
+	private $_mode = TApplicationMode::Debug;
 
 	/**
 	 * @var string Customizable page service ID
@@ -318,22 +318,22 @@ 
 	 * @param boolean whether to cache application configuration. Defaults to true.
 	 * @throws TConfigurationException if configuration file cannot be read or the runtime path is invalid.
 	 */
-	public function __construct($basePath='protected',$cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
+	public function __construct($basePath = 'protected', $cacheConfig = true, $configType = self::CONFIG_TYPE_XML)
 	{
 		// register application as a singleton
 		Prado::setApplication($this);
 		$this->setConfigurationType($configType);
 		$this->resolvePaths($basePath);
 
-		if($cacheConfig)
-			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		if ($cacheConfig)
+			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
 
 		// generates unique ID by hashing the runtime path
-		$this->_uniqueID=md5($this->_runtimePath);
-		$this->_parameters=new TMap;
-		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+		$this->_uniqueID = md5($this->_runtimePath);
+		$this->_parameters = new TMap;
+		$this->_services = array($this->getPageServiceID()=>array('TPageService', array(), null));
 
-		Prado::setPathOfAlias('Application',$this->_basePath);
+		Prado::setPathOfAlias('Application', $this->_basePath);
 	}
 
 	/**
@@ -349,29 +349,29 @@ 
 	protected function resolvePaths($basePath)
 	{
 		// determine configuration path and file
-		if(empty($basePath) || ($basePath=realpath($basePath))===false)
-			throw new TConfigurationException('application_basepath_invalid',$basePath);
-		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName()))
-			$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
-		else if(is_file($basePath))
+		if (empty($basePath) || ($basePath = realpath($basePath)) === false)
+			throw new TConfigurationException('application_basepath_invalid', $basePath);
+		if (is_dir($basePath) && is_file($basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName()))
+			$configFile = $basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName();
+		else if (is_file($basePath))
 		{
-			$configFile=$basePath;
-			$basePath=dirname($configFile);
+			$configFile = $basePath;
+			$basePath = dirname($configFile);
 		}
 		else
-			$configFile=null;
+			$configFile = null;
 
 		// determine runtime path
-		$runtimePath=$basePath.DIRECTORY_SEPARATOR.self::RUNTIME_PATH;
-		if(is_writable($runtimePath))
+		$runtimePath = $basePath . DIRECTORY_SEPARATOR . self::RUNTIME_PATH;
+		if (is_writable($runtimePath))
 		{
-			if($configFile!==null)
+			if ($configFile !== null)
 			{
-				$runtimePath.=DIRECTORY_SEPARATOR.basename($configFile).'-'.Prado::getVersion();
-				if(!is_dir($runtimePath))
+				$runtimePath .= DIRECTORY_SEPARATOR . basename($configFile) . '-' . Prado::getVersion();
+				if (!is_dir($runtimePath))
 				{
-					if(@mkdir($runtimePath)===false)
-						throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
+					if (@mkdir($runtimePath) === false)
+						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
 					@chmod($runtimePath, PRADO_CHMOD); //make it deletable
 				}
 				$this->setConfigurationFile($configFile);
@@ -380,7 +380,7 @@ 
 			$this->setRuntimePath($runtimePath);
 		}
 		else
-			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
+			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 
 	}
 
@@ -394,22 +394,22 @@ 
 		try
 		{
 			$this->initApplication();
-			$n=count(self::$_steps);
-			$this->_step=0;
-			$this->_requestCompleted=false;
-			while($this->_step<$n)
+			$n = count(self::$_steps);
+			$this->_step = 0;
+			$this->_requestCompleted = false;
+			while ($this->_step < $n)
 			{
-				if($this->_mode===self::STATE_OFF)
-					throw new THttpException(503,'application_unavailable');
-				if($this->_requestCompleted)
+				if ($this->_mode === self::STATE_OFF)
+					throw new THttpException(503, 'application_unavailable');
+				if ($this->_requestCompleted)
 					break;
-				$method=self::$_steps[$this->_step];
-				Prado::trace("Executing $method()",'System.TApplication');
+				$method = self::$_steps[$this->_step];
+				Prado::trace("Executing $method()", 'System.TApplication');
 				$this->$method();
 				$this->_step++;
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -423,7 +423,7 @@ 
 	 */
 	public function completeRequest()
 	{
-		$this->_requestCompleted=true;
+		$this->_requestCompleted = true;
 	}
 
 	/**
@@ -442,9 +442,9 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @return mixed the global value corresponding to $key
 	 */
-	public function getGlobalState($key,$defaultValue=null)
+	public function getGlobalState($key, $defaultValue = null)
 	{
-		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
+		return isset($this->_globals[$key]) ? $this->_globals[$key] : $defaultValue;
 	}
 
 	/**
@@ -457,14 +457,14 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
 	 */
-	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
+	public function setGlobalState($key, $value, $defaultValue = null, $forceSave = false)
 	{
-		$this->_stateChanged=true;
-		if($value===$defaultValue)
+		$this->_stateChanged = true;
+		if ($value === $defaultValue)
 			unset($this->_globals[$key]);
 		else
-			$this->_globals[$key]=$value;
-		if($forceSave)
+			$this->_globals[$key] = $value;
+		if ($forceSave)
 			$this->saveGlobals();
 	}
 
@@ -476,7 +476,7 @@ 
 	 */
 	public function clearGlobalState($key)
 	{
-		$this->_stateChanged=true;
+		$this->_stateChanged = true;
 		unset($this->_globals[$key]);
 	}
 
@@ -488,7 +488,7 @@ 
 	 */
 	protected function loadGlobals()
 	{
-		$this->_globals=$this->getApplicationStatePersister()->load();
+		$this->_globals = $this->getApplicationStatePersister()->load();
 	}
 
 	/**
@@ -497,9 +497,9 @@ 
 	 */
 	protected function saveGlobals()
 	{
-		if($this->_stateChanged)
+		if ($this->_stateChanged)
 		{
-			$this->_stateChanged=false;
+			$this->_stateChanged = false;
 			$this->getApplicationStatePersister()->save($this->_globals);
 		}
 	}
@@ -517,7 +517,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 
 	/**
@@ -533,7 +533,7 @@ 
 	 */
 	public function setPageServiceID($value)
 	{
-		$this->_pageServiceID=$value;
+		$this->_pageServiceID = $value;
 	}
 
 	/**
@@ -557,7 +557,7 @@ 
 	 */
 	public function setMode($value)
 	{
-		$this->_mode=TPropertyValue::ensureEnum($value,'TApplicationMode');
+		$this->_mode = TPropertyValue::ensureEnum($value, 'TApplicationMode');
 	}
 
 	/**
@@ -573,7 +573,7 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		$this->_basePath=$value;
+		$this->_basePath = $value;
 	}
 
 	/**
@@ -589,7 +589,7 @@ 
 	 */
 	public function setConfigurationFile($value)
 	{
-		$this->_configFile=$value;
+		$this->_configFile = $value;
 	}
 
 	/**
@@ -613,9 +613,9 @@ 
 	 */
 	public function getConfigurationFileExt()
 	{
-		if($this->_configFileExt===null)
+		if ($this->_configFileExt === null)
 		{
-			switch($this->_configType)
+			switch ($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
 					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_PHP;
@@ -633,9 +633,9 @@ 
 	public function getConfigurationFileName()
 	{
 		static $fileName;
-		if($fileName == null)
+		if ($fileName == null)
 		{
-			switch($this->_configType)
+			switch ($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
 					$fileName = TApplication::CONFIG_FILE_PHP;
@@ -660,11 +660,11 @@ 
 	 */
 	public function setRuntimePath($value)
 	{
-		$this->_runtimePath=$value;
-		if($this->_cacheFile)
-			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		$this->_runtimePath = $value;
+		if ($this->_cacheFile)
+			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
 		// generates unique ID by hashing the runtime path
-		$this->_uniqueID=md5($this->_runtimePath);
+		$this->_uniqueID = md5($this->_runtimePath);
 	}
 
 	/**
@@ -680,7 +680,7 @@ 
 	 */
 	public function setService($value)
 	{
-		$this->_service=$value;
+		$this->_service = $value;
 	}
 
 	/**
@@ -689,12 +689,12 @@ 
 	 * @param string ID of the module
 	 * @param IModule module object or null if the module has not been loaded yet
 	 */
-	public function setModule($id,IModule $module=null)
+	public function setModule($id, IModule $module = null)
 	{
-		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated',$id);
+		if (isset($this->_modules[$id]))
+			throw new TConfigurationException('application_moduleid_duplicated', $id);
 		else
-			$this->_modules[$id]=$module;
+			$this->_modules[$id] = $module;
 	}
 
 	/**
@@ -702,11 +702,11 @@ 
 	 */
 	public function getModule($id)
 	{
-		if(!array_key_exists($id, $this->_modules))
+		if (!array_key_exists($id, $this->_modules))
 			return null;
 
 		// force loading of a lazy module
-		if($this->_modules[$id]===null)
+		if ($this->_modules[$id] === null)
 		{
 			$module = $this->internalLoadModule($id, true);
 			$module[0]->init($module[1]);
@@ -741,9 +741,9 @@ 
 	 */
 	public function getRequest()
 	{
-		if(!$this->_request)
+		if (!$this->_request)
 		{
-			$this->_request=new THttpRequest;
+			$this->_request = new THttpRequest;
 			$this->_request->init(null);
 		}
 		return $this->_request;
@@ -754,7 +754,7 @@ 
 	 */
 	public function setRequest(THttpRequest $request)
 	{
-		$this->_request=$request;
+		$this->_request = $request;
 	}
 
 	/**
@@ -762,9 +762,9 @@ 
 	 */
 	public function getResponse()
 	{
-		if(!$this->_response)
+		if (!$this->_response)
 		{
-			$this->_response=new THttpResponse;
+			$this->_response = new THttpResponse;
 			$this->_response->init(null);
 		}
 		return $this->_response;
@@ -775,7 +775,7 @@ 
 	 */
 	public function setResponse(THttpResponse $response)
 	{
-		$this->_response=$response;
+		$this->_response = $response;
 	}
 
 	/**
@@ -783,9 +783,9 @@ 
 	 */
 	public function getSession()
 	{
-		if(!$this->_session)
+		if (!$this->_session)
 		{
-			$this->_session=new THttpSession;
+			$this->_session = new THttpSession;
 			$this->_session->init(null);
 		}
 		return $this->_session;
@@ -796,7 +796,7 @@ 
 	 */
 	public function setSession(THttpSession $session)
 	{
-		$this->_session=$session;
+		$this->_session = $session;
 	}
 
 	/**
@@ -804,9 +804,9 @@ 
 	 */
 	public function getErrorHandler()
 	{
-		if(!$this->_errorHandler)
+		if (!$this->_errorHandler)
 		{
-			$this->_errorHandler=new TErrorHandler;
+			$this->_errorHandler = new TErrorHandler;
 			$this->_errorHandler->init(null);
 		}
 		return $this->_errorHandler;
@@ -817,7 +817,7 @@ 
 	 */
 	public function setErrorHandler(TErrorHandler $handler)
 	{
-		$this->_errorHandler=$handler;
+		$this->_errorHandler = $handler;
 	}
 
 	/**
@@ -825,9 +825,9 @@ 
 	 */
 	public function getSecurityManager()
 	{
-		if(!$this->_security)
+		if (!$this->_security)
 		{
-			$this->_security=new TSecurityManager;
+			$this->_security = new TSecurityManager;
 			$this->_security->init(null);
 		}
 		return $this->_security;
@@ -838,7 +838,7 @@ 
 	 */
 	public function setSecurityManager(TSecurityManager $sm)
 	{
-		$this->_security=$sm;
+		$this->_security = $sm;
 	}
 
 	/**
@@ -846,9 +846,9 @@ 
 	 */
 	public function getAssetManager()
 	{
-		if(!$this->_assetManager)
+		if (!$this->_assetManager)
 		{
-			$this->_assetManager=new TAssetManager;
+			$this->_assetManager = new TAssetManager;
 			$this->_assetManager->init(null);
 		}
 		return $this->_assetManager;
@@ -859,7 +859,7 @@ 
 	 */
 	public function setAssetManager(TAssetManager $value)
 	{
-		$this->_assetManager=$value;
+		$this->_assetManager = $value;
 	}
 
 	/**
@@ -867,9 +867,9 @@ 
 	 */
 	public function getApplicationStatePersister()
 	{
-		if(!$this->_statePersister)
+		if (!$this->_statePersister)
 		{
-			$this->_statePersister=new TApplicationStatePersister;
+			$this->_statePersister = new TApplicationStatePersister;
 			$this->_statePersister->init(null);
 		}
 		return $this->_statePersister;
@@ -880,7 +880,7 @@ 
 	 */
 	public function setApplicationStatePersister(IStatePersister $persister)
 	{
-		$this->_statePersister=$persister;
+		$this->_statePersister = $persister;
 	}
 
 	/**
@@ -896,7 +896,7 @@ 
 	 */
 	public function setCache(ICache $cache)
 	{
-		$this->_cache=$cache;
+		$this->_cache = $cache;
 	}
 
 	/**
@@ -912,18 +912,18 @@ 
 	 */
 	public function setUser(IUser $user)
 	{
-		$this->_user=$user;
+		$this->_user = $user;
 	}
 
 	/**
 	 * @param boolean whether to create globalization if it does not exist
 	 * @return TGlobalization globalization module
 	 */
-	public function getGlobalization($createIfNotExists=true)
+	public function getGlobalization($createIfNotExists = true)
 	{
-		if($this->_globalization===null && $createIfNotExists)
+		if ($this->_globalization === null && $createIfNotExists)
 		{
-			$this->_globalization=new TGlobalization;
+			$this->_globalization = new TGlobalization;
 			$this->_globalization->init(null);
 		}
 		return $this->_globalization;
@@ -934,7 +934,7 @@ 
 	 */
 	public function setGlobalization(TGlobalization $glob)
 	{
-		$this->_globalization=$glob;
+		$this->_globalization = $glob;
 	}
 
 	/**
@@ -942,8 +942,8 @@ 
 	 */
 	public function getAuthorizationRules()
 	{
-		if($this->_authRules===null)
-			$this->_authRules=new TAuthorizationRuleCollection;
+		if ($this->_authRules === null)
+			$this->_authRules = new TAuthorizationRuleCollection;
 		return $this->_authRules;
 	}
 
@@ -952,99 +952,99 @@ 
 		return 'TApplicationConfiguration';
 	}
 
-	protected function internalLoadModule($id, $force=false)
+	protected function internalLoadModule($id, $force = false)
 	{
-		list($moduleClass, $initProperties, $configElement)=$this->_lazyModules[$id];
-		if(isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
+		list($moduleClass, $initProperties, $configElement) = $this->_lazyModules[$id];
+		if (isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
 		{
-			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})",'System.TApplication');
+			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})", 'System.TApplication');
 			$this->setModule($id, null);
 			return null;
 		}
 
-		Prado::trace("Loading module $id ({$moduleClass})",'System.TApplication');
-		$module=Prado::createComponent($moduleClass);
-		foreach($initProperties as $name=>$value)
+		Prado::trace("Loading module $id ({$moduleClass})", 'System.TApplication');
+		$module = Prado::createComponent($moduleClass);
+		foreach ($initProperties as $name=>$value)
 		{
-			if($name==='lazy') continue;
-			$module->setSubProperty($name,$value);
+			if ($name === 'lazy') continue;
+			$module->setSubProperty($name, $value);
 		}
-		$this->setModule($id,$module);
+		$this->setModule($id, $module);
 		// keep the key to avoid reuse of the old module id
-		$this->_lazyModules[$id]=null;
+		$this->_lazyModules[$id] = null;
 
-		return array($module,$configElement);
+		return array($module, $configElement);
 	}
 	/**
 	 * Applies an application configuration.
 	 * @param TApplicationConfiguration the configuration
 	 * @param boolean whether the configuration is specified within a service.
 	 */
-	public function applyConfiguration($config,$withinService=false)
+	public function applyConfiguration($config, $withinService = false)
 	{
-		if($config->getIsEmpty())
+		if ($config->getIsEmpty())
 			return;
 
 		// set path aliases and using namespaces
-		foreach($config->getAliases() as $alias=>$path)
-			Prado::setPathOfAlias($alias,$path);
-		foreach($config->getUsings() as $using)
+		foreach ($config->getAliases() as $alias=>$path)
+			Prado::setPathOfAlias($alias, $path);
+		foreach ($config->getUsings() as $using)
 			Prado::using($using);
 
 		// set application properties
-		if(!$withinService)
+		if (!$withinService)
 		{
-			foreach($config->getProperties() as $name=>$value)
-				$this->setSubProperty($name,$value);
+			foreach ($config->getProperties() as $name=>$value)
+				$this->setSubProperty($name, $value);
 		}
 
-		if(empty($this->_services))
-			$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+		if (empty($this->_services))
+			$this->_services = array($this->getPageServiceID()=>array('TPageService', array(), null));
 
 		// load parameters
-		foreach($config->getParameters() as $id=>$parameter)
+		foreach ($config->getParameters() as $id=>$parameter)
 		{
-			if(is_array($parameter))
+			if (is_array($parameter))
 			{
-				$component=Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name=>$value)
-					$component->setSubProperty($name,$value);
-				$this->_parameters->add($id,$component);
+				$component = Prado::createComponent($parameter[0]);
+				foreach ($parameter[1] as $name=>$value)
+					$component->setSubProperty($name, $value);
+				$this->_parameters->add($id, $component);
 			}
 			else
-				$this->_parameters->add($id,$parameter);
+				$this->_parameters->add($id, $parameter);
 		}
 
 		// load and init modules specified in app config
-		$modules=array();
-		foreach($config->getModules() as $id=>$moduleConfig)
+		$modules = array();
+		foreach ($config->getModules() as $id=>$moduleConfig)
 		{
-			if(!is_string($id))
-				$id='_module'.count($this->_lazyModules);
-			$this->_lazyModules[$id]=$moduleConfig;
-			if($module = $this->internalLoadModule($id))
-				$modules[]=$module;
+			if (!is_string($id))
+				$id = '_module' . count($this->_lazyModules);
+			$this->_lazyModules[$id] = $moduleConfig;
+			if ($module = $this->internalLoadModule($id))
+				$modules[] = $module;
 		}
-		foreach($modules as $module)
+		foreach ($modules as $module)
 			$module[0]->init($module[1]);
 
 		// load service
-		foreach($config->getServices() as $serviceID=>$serviceConfig)
-			$this->_services[$serviceID]=$serviceConfig;
+		foreach ($config->getServices() as $serviceID=>$serviceConfig)
+			$this->_services[$serviceID] = $serviceConfig;
 
 		// external configurations
-		foreach($config->getExternalConfigurations() as $filePath=>$condition)
+		foreach ($config->getExternalConfigurations() as $filePath=>$condition)
 		{
-			if($condition!==true)
-				$condition=$this->evaluateExpression($condition);
-			if($condition)
+			if ($condition !== true)
+				$condition = $this->evaluateExpression($condition);
+			if ($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,$this->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('application_includefile_invalid',$filePath);
-				$cn=$this->getApplicationConfigurationClass();
-				$c=new $cn;
+				if (($path = Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt())) === null || !is_file($path))
+					throw new TConfigurationException('application_includefile_invalid', $filePath);
+				$cn = $this->getApplicationConfigurationClass();
+				$c = new $cn;
 				$c->loadFromFile($path);
-				$this->applyConfiguration($c,$withinService);
+				$this->applyConfiguration($c, $withinService);
 			}
 		}
 	}
@@ -1060,25 +1060,25 @@ 
 	 */
 	protected function initApplication()
 	{
-		Prado::trace('Initializing application','System.TApplication');
+		Prado::trace('Initializing application', 'System.TApplication');
 
-		if($this->_configFile!==null)
+		if ($this->_configFile !== null)
 		{
-			if($this->_cacheFile===null || @filemtime($this->_cacheFile)<filemtime($this->_configFile))
+			if ($this->_cacheFile === null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
 			{
-				$config=new TApplicationConfiguration;
+				$config = new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
-				if($this->_cacheFile!==null)
-					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+				if ($this->_cacheFile !== null)
+					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
 			}
 			else
-				$config=unserialize(file_get_contents($this->_cacheFile));
+				$config = unserialize(file_get_contents($this->_cacheFile));
 
-			$this->applyConfiguration($config,false);
+			$this->applyConfiguration($config, false);
 		}
 
-		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
-			$serviceID=$this->getPageServiceID();
+		if (($serviceID = $this->getRequest()->resolveRequest(array_keys($this->_services))) === null)
+			$serviceID = $this->getPageServiceID();
 
 		$this->startService($serviceID);
 	}
@@ -1091,34 +1091,34 @@ 
 	 */
 	public function startService($serviceID)
 	{
-		if(isset($this->_services[$serviceID]))
+		if (isset($this->_services[$serviceID]))
 		{
-			list($serviceClass,$initProperties,$configElement)=$this->_services[$serviceID];
-			$service=Prado::createComponent($serviceClass);
-			if(!($service instanceof IService))
-				throw new THttpException(500,'application_service_invalid',$serviceClass);
-			if(!$service->getEnabled())
-				throw new THttpException(500,'application_service_unavailable',$serviceClass);
+			list($serviceClass, $initProperties, $configElement) = $this->_services[$serviceID];
+			$service = Prado::createComponent($serviceClass);
+			if (!($service instanceof IService))
+				throw new THttpException(500, 'application_service_invalid', $serviceClass);
+			if (!$service->getEnabled())
+				throw new THttpException(500, 'application_service_unavailable', $serviceClass);
 			$service->setID($serviceID);
 			$this->setService($service);
 
-			foreach($initProperties as $name=>$value)
-				$service->setSubProperty($name,$value);
+			foreach ($initProperties as $name=>$value)
+				$service->setSubProperty($name, $value);
 
-			if($configElement!==null)
+			if ($configElement !== null)
 			{
-				$config=new TApplicationConfiguration;
-				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement,$this->getBasePath());
+				$config = new TApplicationConfiguration;
+				if ($this->getConfigurationType() == self::CONFIG_TYPE_PHP)
+					$config->loadFromPhp($configElement, $this->getBasePath());
 				else
-					$config->loadFromXml($configElement,$this->getBasePath());
-				$this->applyConfiguration($config,true);
+					$config->loadFromXml($configElement, $this->getBasePath());
+				$this->applyConfiguration($config, true);
 			}
 
 			$service->init($configElement);
 		}
 		else
-			throw new THttpException(500,'application_service_unknown',$serviceID);
+			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 
 	/**
@@ -1129,9 +1129,9 @@ 
 	 */
 	public function onError($param)
 	{
-		Prado::log($param->getMessage(),TLogger::ERROR,'System.TApplication');
-		$this->raiseEvent('OnError',$this,$param);
-		$this->getErrorHandler()->handleError($this,$param);
+		Prado::log($param->getMessage(), TLogger::ERROR, 'System.TApplication');
+		$this->raiseEvent('OnError', $this, $param);
+		$this->getErrorHandler()->handleError($this, $param);
 	}
 
 	/**
@@ -1143,7 +1143,7 @@ 
 	 */
 	public function onBeginRequest()
 	{
-		$this->raiseEvent('OnBeginRequest',$this,null);
+		$this->raiseEvent('OnBeginRequest', $this, null);
 	}
 
 	/**
@@ -1152,7 +1152,7 @@ 
 	 */
 	public function onAuthentication()
 	{
-		$this->raiseEvent('OnAuthentication',$this,null);
+		$this->raiseEvent('OnAuthentication', $this, null);
 	}
 
 	/**
@@ -1161,7 +1161,7 @@ 
 	 */
 	public function onAuthenticationComplete()
 	{
-		$this->raiseEvent('OnAuthenticationComplete',$this,null);
+		$this->raiseEvent('OnAuthenticationComplete', $this, null);
 	}
 
 	/**
@@ -1170,7 +1170,7 @@ 
 	 */
 	public function onAuthorization()
 	{
-		$this->raiseEvent('OnAuthorization',$this,null);
+		$this->raiseEvent('OnAuthorization', $this, null);
 	}
 
 	/**
@@ -1179,7 +1179,7 @@ 
 	 */
 	public function onAuthorizationComplete()
 	{
-		$this->raiseEvent('OnAuthorizationComplete',$this,null);
+		$this->raiseEvent('OnAuthorizationComplete', $this, null);
 	}
 
 	/**
@@ -1189,7 +1189,7 @@ 
 	public function onLoadState()
 	{
 		$this->loadGlobals();
-		$this->raiseEvent('OnLoadState',$this,null);
+		$this->raiseEvent('OnLoadState', $this, null);
 	}
 
 	/**
@@ -1198,7 +1198,7 @@ 
 	 */
 	public function onLoadStateComplete()
 	{
-		$this->raiseEvent('OnLoadStateComplete',$this,null);
+		$this->raiseEvent('OnLoadStateComplete', $this, null);
 	}
 
 	/**
@@ -1207,7 +1207,7 @@ 
 	 */
 	public function onPreRunService()
 	{
-		$this->raiseEvent('OnPreRunService',$this,null);
+		$this->raiseEvent('OnPreRunService', $this, null);
 	}
 
 	/**
@@ -1215,7 +1215,7 @@ 
 	 */
 	public function runService()
 	{
-		if($this->_service)
+		if ($this->_service)
 			$this->_service->run();
 	}
 
@@ -1225,7 +1225,7 @@ 
 	 */
 	public function onSaveState()
 	{
-		$this->raiseEvent('OnSaveState',$this,null);
+		$this->raiseEvent('OnSaveState', $this, null);
 		$this->saveGlobals();
 	}
 
@@ -1235,7 +1235,7 @@ 
 	 */
 	public function onSaveStateComplete()
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,null);
+		$this->raiseEvent('OnSaveStateComplete', $this, null);
 	}
 
 	/**
@@ -1244,7 +1244,7 @@ 
 	 */
 	public function onPreFlushOutput()
 	{
-		$this->raiseEvent('OnPreFlushOutput',$this,null);
+		$this->raiseEvent('OnPreFlushOutput', $this, null);
 	}
 
 	/**
@@ -1263,8 +1263,8 @@ 
 	public function onEndRequest()
 	{
 		$this->flushOutput(false); // flush all remaining content in the buffer
-		$this->saveGlobals();  // save global state
-		$this->raiseEvent('OnEndRequest',$this,null);
+		$this->saveGlobals(); // save global state
+		$this->raiseEvent('OnEndRequest', $this, null);
 	}
 }
 
@@ -1283,10 +1283,10 @@ 
  */
 class TApplicationMode extends TEnumerable
 {
-	const Off='Off';
-	const Debug='Debug';
-	const Normal='Normal';
-	const Performance='Performance';
+	const Off = 'Off';
+	const Debug = 'Debug';
+	const Normal = 'Normal';
+	const Performance = 'Performance';
 }
 
 
@@ -1305,35 +1305,35 @@ 
 	/**
 	 * @var array list of application initial property values, indexed by property names
 	 */
-	private $_properties=array();
+	private $_properties = array();
 	/**
 	 * @var array list of namespaces to be used
 	 */
-	private $_usings=array();
+	private $_usings = array();
 	/**
 	 * @var array list of path aliases, indexed by alias names
 	 */
-	private $_aliases=array();
+	private $_aliases = array();
 	/**
 	 * @var array list of module configurations
 	 */
-	private $_modules=array();
+	private $_modules = array();
 	/**
 	 * @var array list of service configurations
 	 */
-	private $_services=array();
+	private $_services = array();
 	/**
 	 * @var array list of parameters
 	 */
-	private $_parameters=array();
+	private $_parameters = array();
 	/**
 	 * @var array list of included configurations
 	 */
-	private $_includes=array();
+	private $_includes = array();
 	/**
 	 * @var boolean whether this configuration contains actual stuff
 	 */
-	private $_empty=true;
+	private $_empty = true;
 
 	/**
 	 * Parses the application configuration file.
@@ -1342,16 +1342,16 @@ 
 	 */
 	public function loadFromFile($fname)
 	{
-		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+		if (Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
-			$this->loadFromPhp($fcontent,dirname($fname));
+			$this->loadFromPhp($fcontent, dirname($fname));
 		}
 		else
 		{
-			$dom=new TXmlDocument;
+			$dom = new TXmlDocument;
 			$dom->loadFromFile($fname);
-			$this->loadFromXml($dom,dirname($fname));
+			$this->loadFromXml($dom, dirname($fname));
 		}
 	}
 
@@ -1371,29 +1371,29 @@ 
 	public function loadFromPhp($config, $configPath)
 	{
 		// application properties
-		if(isset($config['application']))
+		if (isset($config['application']))
 		{
-			foreach($config['application'] as $name=>$value)
+			foreach ($config['application'] as $name=>$value)
 			{
-				$this->_properties[$name]=$value;
+				$this->_properties[$name] = $value;
 			}
 			$this->_empty = false;
 		}
 
-		if(isset($config['paths']) && is_array($config['paths']))
-			$this->loadPathsPhp($config['paths'],$configPath);
+		if (isset($config['paths']) && is_array($config['paths']))
+			$this->loadPathsPhp($config['paths'], $configPath);
 
-		if(isset($config['modules']) && is_array($config['modules']))
-			$this->loadModulesPhp($config['modules'],$configPath);
+		if (isset($config['modules']) && is_array($config['modules']))
+			$this->loadModulesPhp($config['modules'], $configPath);
 
-		if(isset($config['services']) && is_array($config['services']))
-			$this->loadServicesPhp($config['services'],$configPath);
+		if (isset($config['services']) && is_array($config['services']))
+			$this->loadServicesPhp($config['services'], $configPath);
 
-		if(isset($config['parameters']) && is_array($config['parameters']))
+		if (isset($config['parameters']) && is_array($config['parameters']))
 			$this->loadParametersPhp($config['parameters'], $configPath);
 
-		if(isset($config['includes']) && is_array($config['includes']))
-			$this->loadExternalXml($config['includes'],$configPath);
+		if (isset($config['includes']) && is_array($config['includes']))
+			$this->loadExternalXml($config['includes'], $configPath);
 	}
 
 	/**
@@ -1401,33 +1401,33 @@ 
 	 * @param TXmlElement the XML element
 	 * @param string the context path (for specifying relative paths)
 	 */
-	public function loadFromXml($dom,$configPath)
+	public function loadFromXml($dom, $configPath)
 	{
 		// application properties
-		foreach($dom->getAttributes() as $name=>$value)
+		foreach ($dom->getAttributes() as $name=>$value)
 		{
-			$this->_properties[$name]=$value;
-			$this->_empty=false;
+			$this->_properties[$name] = $value;
+			$this->_empty = false;
 		}
 
-		foreach($dom->getElements() as $element)
+		foreach ($dom->getElements() as $element)
 		{
-			switch($element->getTagName())
+			switch ($element->getTagName())
 			{
 				case 'paths':
-					$this->loadPathsXml($element,$configPath);
+					$this->loadPathsXml($element, $configPath);
 					break;
 				case 'modules':
-					$this->loadModulesXml($element,$configPath);
+					$this->loadModulesXml($element, $configPath);
 					break;
 				case 'services':
-					$this->loadServicesXml($element,$configPath);
+					$this->loadServicesXml($element, $configPath);
 					break;
 				case 'parameters':
-					$this->loadParametersXml($element,$configPath);
+					$this->loadParametersXml($element, $configPath);
 					break;
 				case 'include':
-					$this->loadExternalXml($element,$configPath);
+					$this->loadExternalXml($element, $configPath);
 					break;
 				default:
 					//throw new TConfigurationException('appconfig_tag_invalid',$element->getTagName());
@@ -1443,26 +1443,26 @@ 
 	 */
 	protected function loadPathsPhp($pathsNode, $configPath)
 	{
-		if(isset($pathsNode['aliases']) && is_array($pathsNode['aliases']))
+		if (isset($pathsNode['aliases']) && is_array($pathsNode['aliases']))
 		{
-			foreach($pathsNode['aliases'] as $id=>$path)
+			foreach ($pathsNode['aliases'] as $id=>$path)
 			{
-				$path=str_replace('\\','/',$path);
-				if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))	// if absolute path
-					$p=realpath($path);
+				$path = str_replace('\\', '/', $path);
+				if (preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
+					$p = realpath($path);
 				else
-					$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
-				if($p===false || !is_dir($p))
-					throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
-				if(isset($this->_aliases[$id]))
-					throw new TConfigurationException('appconfig_alias_redefined',$id);
-				$this->_aliases[$id]=$p;
+					$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
+				if ($p === false || !is_dir($p))
+					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
+				if (isset($this->_aliases[$id]))
+					throw new TConfigurationException('appconfig_alias_redefined', $id);
+				$this->_aliases[$id] = $p;
 			}
 		}
 
-		if(isset($pathsNode['using']) && is_array($pathsNode['using']))
+		if (isset($pathsNode['using']) && is_array($pathsNode['using']))
 		{
-			foreach($pathsNode['using'] as $namespace)
+			foreach ($pathsNode['using'] as $namespace)
 			{
 				$this->_usings[] = $namespace;
 			}
@@ -1474,43 +1474,43 @@ 
 	 * @param TXmlElement the paths XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadPathsXml($pathsNode,$configPath)
+	protected function loadPathsXml($pathsNode, $configPath)
 	{
-		foreach($pathsNode->getElements() as $element)
+		foreach ($pathsNode->getElements() as $element)
 		{
-			switch($element->getTagName())
+			switch ($element->getTagName())
 			{
 				case 'alias':
 				{
-					if(($id=$element->getAttribute('id'))!==null && ($path=$element->getAttribute('path'))!==null)
+					if (($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null)
 					{
-						$path=str_replace('\\','/',$path);
-						if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))	// if absolute path
-							$p=realpath($path);
+						$path = str_replace('\\', '/', $path);
+						if (preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
+							$p = realpath($path);
 						else
-							$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
-						if($p===false || !is_dir($p))
-							throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
-						if(isset($this->_aliases[$id]))
-							throw new TConfigurationException('appconfig_alias_redefined',$id);
-						$this->_aliases[$id]=$p;
+							$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
+						if ($p === false || !is_dir($p))
+							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
+						if (isset($this->_aliases[$id]))
+							throw new TConfigurationException('appconfig_alias_redefined', $id);
+						$this->_aliases[$id] = $p;
 					}
 					else
 						throw new TConfigurationException('appconfig_alias_invalid');
-					$this->_empty=false;
+					$this->_empty = false;
 					break;
 				}
 				case 'using':
 				{
-					if(($namespace=$element->getAttribute('namespace'))!==null)
-						$this->_usings[]=$namespace;
+					if (($namespace = $element->getAttribute('namespace')) !== null)
+						$this->_usings[] = $namespace;
 					else
 						throw new TConfigurationException('appconfig_using_invalid');
-					$this->_empty=false;
+					$this->_empty = false;
 					break;
 				}
 				default:
-					throw new TConfigurationException('appconfig_paths_invalid',$element->getTagName());
+					throw new TConfigurationException('appconfig_paths_invalid', $element->getTagName());
 			}
 		}
 	}
@@ -1522,21 +1522,21 @@ 
 	 */
 	protected function loadModulesPhp($modulesNode, $configPath)
 	{
-		foreach($modulesNode as $id=>$module)
+		foreach ($modulesNode as $id=>$module)
 		{
-			if(!isset($module['class']))
-				throw new TConfigurationException('appconfig_moduletype_required',$id);
+			if (!isset($module['class']))
+				throw new TConfigurationException('appconfig_moduletype_required', $id);
 			$type = $module['class'];
 			unset($module['class']);
 			$properties = array();
-			if(isset($module['properties']))
+			if (isset($module['properties']))
 			{
 				$properties = $module['properties'];
 				unset($module['properties']);
 			}
 			$properties['id'] = $id;
-			$this->_modules[$id]=array($type,$properties,$module);
-			$this->_empty=false;
+			$this->_modules[$id] = array($type, $properties, $module);
+			$this->_empty = false;
 		}
 	}
 
@@ -1545,26 +1545,26 @@ 
 	 * @param TXmlElement the modules XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadModulesXml($modulesNode,$configPath)
+	protected function loadModulesXml($modulesNode, $configPath)
 	{
-		foreach($modulesNode->getElements() as $element)
+		foreach ($modulesNode->getElements() as $element)
 		{
-			if($element->getTagName()==='module')
+			if ($element->getTagName() === 'module')
 			{
-				$properties=$element->getAttributes();
-				$id=$properties->itemAt('id');
-				$type=$properties->remove('class');
-				if($type===null)
-					throw new TConfigurationException('appconfig_moduletype_required',$id);
+				$properties = $element->getAttributes();
+				$id = $properties->itemAt('id');
+				$type = $properties->remove('class');
+				if ($type === null)
+					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				$element->setParent(null);
-				if($id===null)
-					$this->_modules[]=array($type,$properties->toArray(),$element);
+				if ($id === null)
+					$this->_modules[] = array($type, $properties->toArray(), $element);
 				else
-					$this->_modules[$id]=array($type,$properties->toArray(),$element);
-				$this->_empty=false;
+					$this->_modules[$id] = array($type, $properties->toArray(), $element);
+				$this->_empty = false;
 			}
 			else
-				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 		}
 	}
 
@@ -1573,17 +1573,17 @@ 
 	 * @param array the services PHP array
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadServicesPhp($servicesNode,$configPath)
+	protected function loadServicesPhp($servicesNode, $configPath)
 	{
-		foreach($servicesNode as $id => $service)
+		foreach ($servicesNode as $id => $service)
 		{
-			if(!isset($service['class']))
+			if (!isset($service['class']))
 				throw new TConfigurationException('appconfig_servicetype_required');
 			$type = $service['class'];
 			$properties = isset($service['properties']) ? $service['properties'] : array();
 			unset($service['properties']);
 			$properties['id'] = $id;
-			$this->_services[$id] = array($type,$properties,$service);
+			$this->_services[$id] = array($type, $properties, $service);
 			$this->_empty = false;
 		}
 	}
@@ -1593,23 +1593,23 @@ 
 	 * @param TXmlElement the services XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadServicesXml($servicesNode,$configPath)
+	protected function loadServicesXml($servicesNode, $configPath)
 	{
-		foreach($servicesNode->getElements() as $element)
+		foreach ($servicesNode->getElements() as $element)
 		{
-			if($element->getTagName()==='service')
+			if ($element->getTagName() === 'service')
 			{
-				$properties=$element->getAttributes();
-				if(($id=$properties->itemAt('id'))===null)
+				$properties = $element->getAttributes();
+				if (($id = $properties->itemAt('id')) === null)
 					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type=$properties->remove('class'))===null)
-					throw new TConfigurationException('appconfig_servicetype_required',$id);
+				if (($type = $properties->remove('class')) === null)
+					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				$element->setParent(null);
-				$this->_services[$id]=array($type,$properties->toArray(),$element);
-				$this->_empty=false;
+				$this->_services[$id] = array($type, $properties->toArray(), $element);
+				$this->_empty = false;
 			}
 			else
-				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 		}
 	}
 
@@ -1618,19 +1618,19 @@ 
 	 * @param array the parameters PHP array
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadParametersPhp($parametersNode,$configPath)
+	protected function loadParametersPhp($parametersNode, $configPath)
 	{
-		foreach($parametersNode as $id => $parameter)
+		foreach ($parametersNode as $id => $parameter)
 		{
-			if(is_array($parameter))
+			if (is_array($parameter))
 			{
-				if(isset($parameter['class']))
+				if (isset($parameter['class']))
 				{
 					$type = $parameter['class'];
 					unset($parameter['class']);
 					$properties = isset($service['properties']) ? $service['properties'] : array();
 					$properties['id'] = $id;
-					$this->_parameters[$id] = array($type,$properties);
+					$this->_parameters[$id] = array($type, $properties);
 				}
 			}
 			else
@@ -1645,28 +1645,28 @@ 
 	 * @param TXmlElement the parameters XML node
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadParametersXml($parametersNode,$configPath)
+	protected function loadParametersXml($parametersNode, $configPath)
 	{
-		foreach($parametersNode->getElements() as $element)
+		foreach ($parametersNode->getElements() as $element)
 		{
-			if($element->getTagName()==='parameter')
+			if ($element->getTagName() === 'parameter')
 			{
-				$properties=$element->getAttributes();
-				if(($id=$properties->remove('id'))===null)
+				$properties = $element->getAttributes();
+				if (($id = $properties->remove('id')) === null)
 					throw new TConfigurationException('appconfig_parameterid_required');
-				if(($type=$properties->remove('class'))===null)
+				if (($type = $properties->remove('class')) === null)
 				{
-					if(($value=$properties->remove('value'))===null)
-						$this->_parameters[$id]=$element;
+					if (($value = $properties->remove('value')) === null)
+						$this->_parameters[$id] = $element;
 					else
-						$this->_parameters[$id]=$value;
+						$this->_parameters[$id] = $value;
 				}
 				else
-					$this->_parameters[$id]=array($type,$properties->toArray());
-				$this->_empty=false;
+					$this->_parameters[$id] = array($type, $properties->toArray());
+				$this->_empty = false;
 			}
 			else
-				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 		}
 	}
 
@@ -1675,19 +1675,19 @@ 
 	 * @param array the application PHP array
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadExternalPhp($includeNode,$configPath)
+	protected function loadExternalPhp($includeNode, $configPath)
 	{
-		foreach($includeNode as $include)
+		foreach ($includeNode as $include)
 		{
-			$when = isset($include['when'])?true:false;
-			if(!isset($include['file']))
+			$when = isset($include['when']) ?true:false;
+			if (!isset($include['file']))
 				throw new TConfigurationException('appconfig_includefile_required');
 			$filePath = $include['file'];
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
+			if (isset($this->_includes[$filePath]))
+				$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
 			else
-				$$this->_includes[$filePath]=$when;
-			$this->_empty=false;
+				$$this->_includes[$filePath] = $when;
+			$this->_empty = false;
 		}
 	}
 
@@ -1696,17 +1696,17 @@ 
 	 * @param TXmlElement the application DOM element
 	 * @param string the context path (for specifying relative paths)
 	 */
-	protected function loadExternalXml($includeNode,$configPath)
+	protected function loadExternalXml($includeNode, $configPath)
 	{
-		if(($when=$includeNode->getAttribute('when'))===null)
-			$when=true;
-		if(($filePath=$includeNode->getAttribute('file'))===null)
+		if (($when = $includeNode->getAttribute('when')) === null)
+			$when = true;
+		if (($filePath = $includeNode->getAttribute('file')) === null)
 			throw new TConfigurationException('appconfig_includefile_required');
-		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
+		if (isset($this->_includes[$filePath]))
+			$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
 		else
-			$this->_includes[$filePath]=$when;
-		$this->_empty=false;
+			$this->_includes[$filePath] = $when;
+		$this->_empty = false;
 	}
 
 	/**
@@ -1813,7 +1813,7 @@ 
 	/**
 	 * Name of the value stored in cache
 	 */
-	const CACHE_NAME='prado:appstate';
+	const CACHE_NAME = 'prado:appstate';
 
 	/**
 	 * Initializes module.
@@ -1829,7 +1829,7 @@ 
 	 */
 	protected function getStateFilePath()
 	{
-		return $this->getApplication()->getRuntimePath().'/global.cache';
+		return $this->getApplication()->getRuntimePath() . '/global.cache';
 	}
 
 	/**
@@ -1838,11 +1838,11 @@ 
 	 */
 	public function load()
 	{
-		if(($cache=$this->getApplication()->getCache())!==null && ($value=$cache->get(self::CACHE_NAME))!==false)
+		if (($cache = $this->getApplication()->getCache()) !== null && ($value = $cache->get(self::CACHE_NAME)) !== false)
 			return unserialize($value);
 		else
 		{
-			if(($content=@file_get_contents($this->getStateFilePath()))!==false)
+			if (($content = @file_get_contents($this->getStateFilePath())) !== false)
 				return unserialize($content);
 			else
 				return null;
@@ -1855,19 +1855,19 @@ 
 	 */
 	public function save($state)
 	{
-		$content=serialize($state);
-		$saveFile=true;
-		if(($cache=$this->getApplication()->getCache())!==null)
+		$content = serialize($state);
+		$saveFile = true;
+		if (($cache = $this->getApplication()->getCache()) !== null)
 		{
-			if($cache->get(self::CACHE_NAME)===$content)
-				$saveFile=false;
+			if ($cache->get(self::CACHE_NAME) === $content)
+				$saveFile = false;
 			else
-				$cache->set(self::CACHE_NAME,$content);
+				$cache->set(self::CACHE_NAME, $content);
 		}
-		if($saveFile)
+		if ($saveFile)
 		{
-			$fileName=$this->getStateFilePath();
-			file_put_contents($fileName,$content,LOCK_EX);
+			$fileName = $this->getStateFilePath();
+			file_put_contents($fileName, $content, LOCK_EX);
 		}
 	}
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -404,7 +404,7 @@
 				if($this->_requestCompleted)
 					break;
 				$method=self::$_steps[$this->_step];
-				Prado::trace("Executing $method()",'System.TApplication');
+				Prado::trace("executing $method()",'System.TApplication');
 				$this->$method();
 				$this->_step++;
 			}

framework/TService.php

Doc Comments +1 added lines

@@ -49,6 +49,7 @@
 
 	/**
 	 * @param string id of this service
+	 * @param string $value
 	 */
 	public function setID($value)
 	{

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 	/**
 	 * @var boolean whether the service is enabled
 	 */
-	private $_enabled=true;
+	private $_enabled = true;
 
 	/**
 	 * Initializes the service and attaches {@link run} to the RunService event of application.
@@ -52,7 +52,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 
 	/**
@@ -68,7 +68,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$this->_enabled=TPropertyValue::ensureBoolean($value);
+		$this->_enabled = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

framework/Util/TLogger.php

Doc Comments +1 added lines

@@ -98,6 +98,7 @@
 	 * @param integer level filter
 	 * @param array category filter
 	 * @param array control filter
+	 * @param integer $levels
 	 * @return array list of messages. Each array elements represents one message
 	 * with the following structure:
 	 * array(

Spacing +49 added lines, -49 removed lines

@@ -25,17 +25,17 @@ 
 	/**
 	 * Log levels.
 	 */
-	const DEBUG=0x01;
-	const INFO=0x02;
-	const NOTICE=0x04;
-	const WARNING=0x08;
-	const ERROR=0x10;
-	const ALERT=0x20;
-	const FATAL=0x40;
+	const DEBUG = 0x01;
+	const INFO = 0x02;
+	const NOTICE = 0x04;
+	const WARNING = 0x08;
+	const ERROR = 0x10;
+	const ALERT = 0x20;
+	const FATAL = 0x40;
 	/**
 	 * @var array log messages
 	 */
-	private $_logs=array();
+	private $_logs = array();
 	/**
 	 * @var integer log levels (bits) to be filtered
 	 */
@@ -63,16 +63,16 @@ 
 	 * @param string category of the message
 	 * @param string|TControl control of the message
 	 */
-	public function log($message,$level,$category='Uncategorized', $ctl=null)
+	public function log($message, $level, $category = 'Uncategorized', $ctl = null)
 	{
-		if($ctl) {
-			if($ctl instanceof TControl)
+		if ($ctl) {
+			if ($ctl instanceof TControl)
 				$ctl = $ctl->ClientId;
-			else if(!is_string($ctl))
+			else if (!is_string($ctl))
 				$ctl = null;
 		} else
 			$ctl = null;
-		$this->_logs[]=array($message,$level,$category,microtime(true),memory_get_usage(),$ctl);
+		$this->_logs[] = array($message, $level, $category, microtime(true), memory_get_usage(), $ctl);
 	}
 
 	/**
@@ -108,23 +108,23 @@ 
 	 *   [4] => memory in bytes
 	 *   [5] => control client id
 	 */
-	public function getLogs($levels=null,$categories=null,$controls=null,$timestamp=null)
+	public function getLogs($levels = null, $categories = null, $controls = null, $timestamp = null)
 	{
-		$this->_levels=$levels;
-		$this->_categories=$categories;
-		$this->_controls=$controls;
-		$this->_timestamp=$timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
+		$this->_levels = $levels;
+		$this->_categories = $categories;
+		$this->_controls = $controls;
+		$this->_timestamp = $timestamp;
+		if (empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
 			return $this->_logs;
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByLevels')) ));
-		if(!empty($categories))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByCategories')) ));
-		if(!empty($controls))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByControl')) ));
-		if(!is_null($timestamp))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByTimeStamp')) ));
+		if (!empty($levels))
+			$logs = array_values(array_filter(array_filter($logs, array($this, 'filterByLevels'))));
+		if (!empty($categories))
+			$logs = array_values(array_filter(array_filter($logs, array($this, 'filterByCategories'))));
+		if (!empty($controls))
+			$logs = array_values(array_filter(array_filter($logs, array($this, 'filterByControl'))));
+		if (!is_null($timestamp))
+			$logs = array_values(array_filter(array_filter($logs, array($this, 'filterByTimeStamp'))));
 		return $logs;
 	}
 
@@ -152,27 +152,27 @@ 
 	 * @param array category filter
 	 * @param array control filter
 	 */
-	public function deleteLogs($levels=null,$categories=null,$controls=null,$timestamp=null)
+	public function deleteLogs($levels = null, $categories = null, $controls = null, $timestamp = null)
 	{
-		$this->_levels=$levels;
-		$this->_categories=$categories;
-		$this->_controls=$controls;
-		$this->_timestamp=$timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
+		$this->_levels = $levels;
+		$this->_categories = $categories;
+		$this->_controls = $controls;
+		$this->_timestamp = $timestamp;
+		if (empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
 		{
-			$this->_logs=array();
+			$this->_logs = array();
 			return;
 		}
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_filter( array_filter($logs,array($this,'filterByLevels')) );
-		if(!empty($categories))
-			$logs = array_filter( array_filter($logs,array($this,'filterByCategories')) );
-		if(!empty($controls))
-			$logs = array_filter( array_filter($logs,array($this,'filterByControl')) );
-		if(!is_null($timestamp))
-			$logs = array_filter( array_filter($logs,array($this,'filterByTimeStamp')) );
-		$this->_logs = array_values( array_diff_key($this->_logs, $logs) );
+		if (!empty($levels))
+			$logs = array_filter(array_filter($logs, array($this, 'filterByLevels')));
+		if (!empty($categories))
+			$logs = array_filter(array_filter($logs, array($this, 'filterByCategories')));
+		if (!empty($controls))
+			$logs = array_filter(array_filter($logs, array($this, 'filterByControl')));
+		if (!is_null($timestamp))
+			$logs = array_filter(array_filter($logs, array($this, 'filterByTimeStamp')));
+		$this->_logs = array_values(array_diff_key($this->_logs, $logs));
 	}
 
 	/**
@@ -181,10 +181,10 @@ 
 	 */
 	private function filterByCategories($value)
 	{
-		foreach($this->_categories as $category)
+		foreach ($this->_categories as $category)
 		{
 			// element 2 is the category
-			if($value[2]===$category || strpos($value[2],$category.'.')===0)
+			if ($value[2] === $category || strpos($value[2], $category . '.') === 0)
 				return $value;
 		}
 		return false;
@@ -197,7 +197,7 @@ 
 	private function filterByLevels($value)
 	{
 		// element 1 are the levels
-		if($value[1] & $this->_levels)
+		if ($value[1] & $this->_levels)
 			return $value;
 		else
 			return false;
@@ -210,9 +210,9 @@ 
 	private function filterByControl($value)
 	{
 		// element 5 are the control client ids
-		foreach($this->_controls as $control)
+		foreach ($this->_controls as $control)
 		{
-			if($value[5]===$control || strpos($value[5],$control)===0)
+			if ($value[5] === $control || strpos($value[5], $control) === 0)
 				return $value;
 		}
 		return false;
@@ -225,7 +225,7 @@ 
 	private function filterByTimeStamp($value)
 	{
 		// element 3 is the timestamp
-		if($value[3] <= $this->_timestamp)
+		if ($value[3] <= $this->_timestamp)
 			return $value;
 		else
 			return false;

framework/Util/TRpcClient.php

Doc Comments +3 added lines

@@ -105,6 +105,9 @@
 	 * @param string RPC server URL
 	 * @param array payload data
 	 * @param string request mime type
+	 * @param string $serverUrl
+	 * @param string $mimeType
+	 * @return string
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{

Spacing +9 added lines, -9 removed lines

@@ -78,7 +78,7 @@ 
 	 */
 	public static function create($type, $serverUrl, $isNotification = false)
 	{
-		if(($_handler = constant('TRpcClientTypesEnumerable::'.strtoupper($type))) === null)
+		if (($_handler = constant('TRpcClientTypesEnumerable::' . strtoupper($type))) === null)
 			throw new TApplicationException('rpcclient_unsupported_handler');
 
 		return new $_handler($serverUrl, $isNotification);
@@ -108,8 +108,8 @@ 
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{
-		if(($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
-			throw new TRpcClientRequestException('Request failed ("'.$http_response_header[0].'")');
+		if (($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
+			throw new TRpcClientRequestException('Request failed ("' . $http_response_header[0] . '")');
 
 		return $_response;
 	}
@@ -242,15 +242,15 @@ 
 		$_response = $this->performRequest($this->getServerUrl(), $this->encodeRequest($method, $parameters), 'application/json');
 
 		// skip response handling if the request was just a notification request
-		if($this->isNotification)
+		if ($this->isNotification)
 			return true;
 
 		// decode response
-		if(($_response = json_decode($_response, true)) === null)
+		if (($_response = json_decode($_response, true)) === null)
 			throw new TRpcClientResponseException('Empty response received');
 
 		// handle error response
-		if(!is_null($_response['error']))
+		if (!is_null($_response['error']))
 			throw new TRpcClientResponseException($_response['error']);
 
 		return $_response['result'];
@@ -320,15 +320,15 @@ 
 		$_response = $this->performRequest($this->getServerUrl(), $this->encodeRequest($method, $parameters), 'text/xml');
 
 		// skip response handling if the request was just a notification request
-		if($this->isNotification)
+		if ($this->isNotification)
 			return true;
 
 		// decode response
-		if(($_response = xmlrpc_decode($_response)) === null)
+		if (($_response = xmlrpc_decode($_response)) === null)
 			throw new TRpcClientResponseException('Empty response received');
 
 		// handle error response
-		if(xmlrpc_is_fault($_response))
+		if (xmlrpc_is_fault($_response))
 			throw new TRpcClientResponseException($_response['faultString'], $_response['faultCode']);
 
 		return $_response;

framework/Web/Javascripts/JSMin.php

Doc Comments +9 added lines

@@ -73,6 +73,9 @@ 
 
   // -- Protected Instance Methods ---------------------------------------------
 
+  /**
+   * @param integer $d
+   */
   protected function action($d) {
     switch($d) {
       case 1:
@@ -132,6 +135,9 @@ 
     }
   }
 
+  /**
+   * @return string
+   */
   protected function get() {
     $c = $this->lookAhead;
     $this->lookAhead = null;
@@ -156,6 +162,9 @@ 
     return ' ';
   }
 
+  /**
+   * @param string $c
+   */
   protected function isAlphaNum($c) {
     return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
   }

Indentation +198 added lines, -198 removed lines

@@ -60,229 +60,229 @@
   // -- Public Static Methods --------------------------------------------------
 
   public static function minify($js) {
-    $jsmin = new JSMin($js);
-    return $jsmin->min();
+	$jsmin = new JSMin($js);
+	return $jsmin->min();
   }
 
   // -- Public Instance Methods ------------------------------------------------
 
   public function __construct($input) {
-    $this->input       = str_replace("\r\n", "\n", $input);
-    $this->inputLength = strlen($this->input);
+	$this->input       = str_replace("\r\n", "\n", $input);
+	$this->inputLength = strlen($this->input);
   }
 
   // -- Protected Instance Methods ---------------------------------------------
 
   protected function action($d) {
-    switch($d) {
-      case 1:
-        $this->output .= $this->a;
-
-      case 2:
-        $this->a = $this->b;
-
-        if ($this->a === "'" || $this->a === '"') {
-          for (;;) {
-            $this->output .= $this->a;
-            $this->a       = $this->get();
-
-            if ($this->a === $this->b) {
-              break;
-            }
-
-            if (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated string literal.');
-            }
-
-            if ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            }
-          }
-        }
-
-      case 3:
-        $this->b = $this->next();
-
-        if ($this->b === '/' && (
-            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
-            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
-            $this->a === '&' || $this->a === '|' || $this->a === '?')) {
-
-          $this->output .= $this->a . $this->b;
-
-          for (;;) {
-            $this->a = $this->get();
-
-            if ($this->a === '/') {
-              break;
-            } elseif ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            } elseif (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated regular expression '.
-                  'literal.');
-            }
-
-            $this->output .= $this->a;
-          }
-
-          $this->b = $this->next();
-        }
-    }
+	switch($d) {
+	  case 1:
+		$this->output .= $this->a;
+
+	  case 2:
+		$this->a = $this->b;
+
+		if ($this->a === "'" || $this->a === '"') {
+		  for (;;) {
+			$this->output .= $this->a;
+			$this->a       = $this->get();
+
+			if ($this->a === $this->b) {
+			  break;
+			}
+
+			if (ord($this->a) <= self::ORD_LF) {
+			  throw new JSMinException('Unterminated string literal.');
+			}
+
+			if ($this->a === '\\') {
+			  $this->output .= $this->a;
+			  $this->a       = $this->get();
+			}
+		  }
+		}
+
+	  case 3:
+		$this->b = $this->next();
+
+		if ($this->b === '/' && (
+			$this->a === '(' || $this->a === ',' || $this->a === '=' ||
+			$this->a === ':' || $this->a === '[' || $this->a === '!' ||
+			$this->a === '&' || $this->a === '|' || $this->a === '?')) {
+
+		  $this->output .= $this->a . $this->b;
+
+		  for (;;) {
+			$this->a = $this->get();
+
+			if ($this->a === '/') {
+			  break;
+			} elseif ($this->a === '\\') {
+			  $this->output .= $this->a;
+			  $this->a       = $this->get();
+			} elseif (ord($this->a) <= self::ORD_LF) {
+			  throw new JSMinException('Unterminated regular expression '.
+				  'literal.');
+			}
+
+			$this->output .= $this->a;
+		  }
+
+		  $this->b = $this->next();
+		}
+	}
   }
 
   protected function get() {
-    $c = $this->lookAhead;
-    $this->lookAhead = null;
-
-    if ($c === null) {
-      if ($this->inputIndex < $this->inputLength) {
-        $c = $this->input[$this->inputIndex];
-        $this->inputIndex += 1;
-      } else {
-        $c = null;
-      }
-    }
-
-    if ($c === "\r") {
-      return "\n";
-    }
-
-    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
-      return $c;
-    }
-
-    return ' ';
+	$c = $this->lookAhead;
+	$this->lookAhead = null;
+
+	if ($c === null) {
+	  if ($this->inputIndex < $this->inputLength) {
+		$c = $this->input[$this->inputIndex];
+		$this->inputIndex += 1;
+	  } else {
+		$c = null;
+	  }
+	}
+
+	if ($c === "\r") {
+	  return "\n";
+	}
+
+	if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
+	  return $c;
+	}
+
+	return ' ';
   }
 
   protected function isAlphaNum($c) {
-    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
+	return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
   }
 
   protected function min() {
-    $this->a = "\n";
-    $this->action(3);
-
-    while ($this->a !== null) {
-      switch ($this->a) {
-        case ' ':
-          if ($this->isAlphaNum($this->b)) {
-            $this->action(1);
-          } else {
-            $this->action(2);
-          }
-          break;
-
-        case "\n":
-          switch ($this->b) {
-            case '{':
-            case '[':
-            case '(':
-            case '+':
-            case '-':
-              $this->action(1);
-              break;
-
-            case ' ':
-              $this->action(3);
-              break;
-
-            default:
-              if ($this->isAlphaNum($this->b)) {
-                $this->action(1);
-              }
-              else {
-                $this->action(2);
-              }
-          }
-          break;
-
-        default:
-          switch ($this->b) {
-            case ' ':
-              if ($this->isAlphaNum($this->a)) {
-                $this->action(1);
-                break;
-              }
-
-              $this->action(3);
-              break;
-
-            case "\n":
-              switch ($this->a) {
-                case '}':
-                case ']':
-                case ')':
-                case '+':
-                case '-':
-                case '"':
-                case "'":
-                  $this->action(1);
-                  break;
-
-                default:
-                  if ($this->isAlphaNum($this->a)) {
-                    $this->action(1);
-                  }
-                  else {
-                    $this->action(3);
-                  }
-              }
-              break;
-
-            default:
-              $this->action(1);
-              break;
-          }
-      }
-    }
-
-    return $this->output;
+	$this->a = "\n";
+	$this->action(3);
+
+	while ($this->a !== null) {
+	  switch ($this->a) {
+		case ' ':
+		  if ($this->isAlphaNum($this->b)) {
+			$this->action(1);
+		  } else {
+			$this->action(2);
+		  }
+		  break;
+
+		case "\n":
+		  switch ($this->b) {
+			case '{':
+			case '[':
+			case '(':
+			case '+':
+			case '-':
+			  $this->action(1);
+			  break;
+
+			case ' ':
+			  $this->action(3);
+			  break;
+
+			default:
+			  if ($this->isAlphaNum($this->b)) {
+				$this->action(1);
+			  }
+			  else {
+				$this->action(2);
+			  }
+		  }
+		  break;
+
+		default:
+		  switch ($this->b) {
+			case ' ':
+			  if ($this->isAlphaNum($this->a)) {
+				$this->action(1);
+				break;
+			  }
+
+			  $this->action(3);
+			  break;
+
+			case "\n":
+			  switch ($this->a) {
+				case '}':
+				case ']':
+				case ')':
+				case '+':
+				case '-':
+				case '"':
+				case "'":
+				  $this->action(1);
+				  break;
+
+				default:
+				  if ($this->isAlphaNum($this->a)) {
+					$this->action(1);
+				  }
+				  else {
+					$this->action(3);
+				  }
+			  }
+			  break;
+
+			default:
+			  $this->action(1);
+			  break;
+		  }
+	  }
+	}
+
+	return $this->output;
   }
 
   protected function next() {
-    $c = $this->get();
-
-    if ($c === '/') {
-      switch($this->peek()) {
-        case '/':
-          for (;;) {
-            $c = $this->get();
-
-            if (ord($c) <= self::ORD_LF) {
-              return $c;
-            }
-          }
-
-        case '*':
-          $this->get();
-
-          for (;;) {
-            switch($this->get()) {
-              case '*':
-                if ($this->peek() === '/') {
-                  $this->get();
-                  return ' ';
-                }
-                break;
-
-              case null:
-                throw new JSMinException('Unterminated comment.');
-            }
-          }
-
-        default:
-          return $c;
-      }
-    }
-
-    return $c;
+	$c = $this->get();
+
+	if ($c === '/') {
+	  switch($this->peek()) {
+		case '/':
+		  for (;;) {
+			$c = $this->get();
+
+			if (ord($c) <= self::ORD_LF) {
+			  return $c;
+			}
+		  }
+
+		case '*':
+		  $this->get();
+
+		  for (;;) {
+			switch($this->get()) {
+			  case '*':
+				if ($this->peek() === '/') {
+				  $this->get();
+				  return ' ';
+				}
+				break;
+
+			  case null:
+				throw new JSMinException('Unterminated comment.');
+			}
+		  }
+
+		default:
+		  return $c;
+	  }
+	}
+
+	return $c;
   }
 
   protected function peek() {
-    $this->lookAhead = $this->get();
-    return $this->lookAhead;
+	$this->lookAhead = $this->get();
+	return $this->lookAhead;
   }
 }
 

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
   // -- Protected Instance Methods ---------------------------------------------
 
   protected function action($d) {
-    switch($d) {
+    switch ($d) {
       case 1:
         $this->output .= $this->a;
 
@@ -120,7 +120,7 @@ 
               $this->output .= $this->a;
               $this->a       = $this->get();
             } elseif (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated regular expression '.
+              throw new JSMinException('Unterminated regular expression ' .
                   'literal.');
             }
 
@@ -245,7 +245,7 @@ 
     $c = $this->get();
 
     if ($c === '/') {
-      switch($this->peek()) {
+      switch ($this->peek()) {
         case '/':
           for (;;) {
             $c = $this->get();
@@ -259,7 +259,7 @@ 
           $this->get();
 
           for (;;) {
-            switch($this->get()) {
+            switch ($this->get()) {
               case '*':
                 if ($this->peek() === '/') {
                   $this->get();

Braces +2 added lines, -4 removed lines

@@ -191,8 +191,7 @@ 
             default:
               if ($this->isAlphaNum($this->b)) {
                 $this->action(1);
-              }
-              else {
+              } else {
                 $this->action(2);
               }
           }
@@ -224,8 +223,7 @@ 
                 default:
                   if ($this->isAlphaNum($this->a)) {
                     $this->action(1);
-                  }
-                  else {
+                  } else {
                     $this->action(3);
                   }
               }