pradosoft / prado

demos/time-tracker/protected/pages/TimeTracker/ProjectDetails.php

Doc Comments +3 added lines

@@ -84,6 +84,9 @@
 		$this->members->SelectedValues = $members;
 	}
 	
+	/**
+	 * @param string $role
+	 */
 	protected function getUsersWithRole($role)
 	{
 		if(is_null($this->allUsers))

Spacing +20 added lines, -20 removed lines

@@ -8,10 +8,10 @@ 
 	
 	protected function getCurrentProject()
 	{
-		if(!$this->currentProject)
+		if (!$this->currentProject)
 		{
 			$id = intval($this->Request['ProjectID']);
-			if($id > 0)
+			if ($id > 0)
 				$this->currentProject = $this->getProjectDao()->getProjectByID($id);
 		}
 		return $this->currentProject;
@@ -29,7 +29,7 @@ 
 	
 	public function onLoad($param)
 	{
-		if(!$this->IsPostBack)
+		if (!$this->IsPostBack)
 		{
 			$this->manager->DataSource = $this->getUsersWithRole('manager');
 			$this->manager->dataBind();
@@ -38,7 +38,7 @@ 
 			
 			$project = $this->getCurrentProject();
 			
-			if($project !== null)
+			if ($project !== null)
 			{
 				$this->projectName->Text = $project->Name;
 				$this->completionDate->TimeStamp = $project->CompletionDate;
@@ -70,9 +70,9 @@ 
 	protected function getProjects()
 	{
 		$projects = array();
-		foreach($this->getProjectDao()->getAllProjects() as $project)
+		foreach ($this->getProjectDao()->getAllProjects() as $project)
 		{
-			if($project->Name != $this->currentProject->Name)
+			if ($project->Name != $this->currentProject->Name)
 				$projects[$project->ID] = $project->Name;
 		}
 		return $projects;
@@ -86,15 +86,15 @@ 
 	
 	protected function getUsersWithRole($role)
 	{
-		if(is_null($this->allUsers))
+		if (is_null($this->allUsers))
 		{
 			$dao = $this->Application->Modules['daos']->getDao('UserDao');
 			$this->allUsers = $dao->getAllUsers();		
 		}
 		$users = array();
-		foreach($this->allUsers as $user)
+		foreach ($this->allUsers as $user)
 		{
-			if($user->isInRole($role))
+			if ($user->isInRole($role))
 				$users[$user->Name] = $user->Name;
 		}
 		return $users;
@@ -103,9 +103,9 @@ 
 	public function onPreRender($param)
 	{
 		$ids = array();
-		foreach($this->members->Items as $item)
+		foreach ($this->members->Items as $item)
 		{
-			if($item->Selected)
+			if ($item->Selected)
 				$ids[] = $item->Value;	
 		}
 		$this->setViewState('ActiveConsultants', $ids);
@@ -113,14 +113,14 @@ 
 	
 	public function saveButton_clicked($sender, $param)
 	{
-		if(!$this->Page->IsValid)
+		if (!$this->Page->IsValid)
 			return;
 			
 		$newProject = new ProjectRecord;
 		
 		$projectDao = $this->getProjectDao();
 		
-		if($project = $this->getCurrentProject())
+		if ($project = $this->getCurrentProject())
 			$newProject = $projectDao->getProjectByID($project->ID);
 		else
 			$newProject->CreatorUserName = $this->User->Name;
@@ -131,7 +131,7 @@ 
 		$newProject->EstimateDuration = floatval($this->estimateHours->Text);
 		$newProject->ManagerUserName = $this->manager->SelectedValue;
 		
-		if($this->currentProject)
+		if ($this->currentProject)
 			$projectDao->updateProject($newProject);
 		else
 			$projectDao->addNewProject($newProject);
@@ -148,16 +148,16 @@ 
 	{
 		$active = $this->getViewState('ActiveConsultants');
 		$projectDao = $this->getProjectDao();
-		foreach($this->members->Items as $item)
+		foreach ($this->members->Items as $item)
 		{
-			if($item->Selected)
+			if ($item->Selected)
 			{
-				if(!in_array($item->Value, $active))
+				if (!in_array($item->Value, $active))
 					$projectDao->addUserToProject($projectID, $item->Value);
 			}
 			else
 			{
-				if(in_array($item->Value, $active))
+				if (in_array($item->Value, $active))
 					$projectDao->removeUserFromProject($projectID, $item->Value);
 			}
 		}
@@ -165,7 +165,7 @@ 
 	
 	public function deleteButton_clicked($sender, $param)
 	{
-		if($project = $this->getCurrentProject())
+		if ($project = $this->getCurrentProject())
 		{
 			$this->getProjectDao()->deleteProject($project->ID);
 			$url = $this->Service->constructUrl('TimeTracker.ProjectList');
@@ -179,7 +179,7 @@ 
 		$categoryDao = $this->getCategoryDao();
 		$categories = $categoryDao->getCategoriesByProjectID($project);
 		$currentProject = $this->getCurrentProject();
-		foreach($categories as $cat)
+		foreach ($categories as $cat)
 		{
 			$cat->ProjectID = $currentProject->ID;
 			$categoryDao->addNewCategory($cat);

Braces +33 added lines, -26 removed lines

@@ -11,8 +11,9 @@ 
 		if(!$this->currentProject)
 		{
 			$id = intval($this->Request['ProjectID']);
-			if($id > 0)
-				$this->currentProject = $this->getProjectDao()->getProjectByID($id);
+			if($id > 0) {
+							$this->currentProject = $this->getProjectDao()->getProjectByID($id);
+			}
 		}
 		return $this->currentProject;
 	}
@@ -57,8 +58,7 @@ 
 				$this->projectList->DataSource = $this->getProjects();
 				$this->projectList->dataBind();
 				
-			}
-			else
+			} else
 			{
 				$this->projectCategoryColumn->Visible = false;
 				$this->deleteButton->Visible = false;
@@ -72,8 +72,9 @@ 
 		$projects = array();
 		foreach($this->getProjectDao()->getAllProjects() as $project)
 		{
-			if($project->Name != $this->currentProject->Name)
-				$projects[$project->ID] = $project->Name;
+			if($project->Name != $this->currentProject->Name) {
+							$projects[$project->ID] = $project->Name;
+			}
 		}
 		return $projects;
 	}
@@ -94,8 +95,9 @@ 
 		$users = array();
 		foreach($this->allUsers as $user)
 		{
-			if($user->isInRole($role))
-				$users[$user->Name] = $user->Name;
+			if($user->isInRole($role)) {
+							$users[$user->Name] = $user->Name;
+			}
 		}
 		return $users;
 	}
@@ -105,25 +107,28 @@ 
 		$ids = array();
 		foreach($this->members->Items as $item)
 		{
-			if($item->Selected)
-				$ids[] = $item->Value;	
+			if($item->Selected) {
+							$ids[] = $item->Value;
+			}
 		}
 		$this->setViewState('ActiveConsultants', $ids);
 	}
 	
 	public function saveButton_clicked($sender, $param)
 	{
-		if(!$this->Page->IsValid)
-			return;
+		if(!$this->Page->IsValid) {
+					return;
+		}
 			
 		$newProject = new ProjectRecord;
 		
 		$projectDao = $this->getProjectDao();
 		
-		if($project = $this->getCurrentProject())
-			$newProject = $projectDao->getProjectByID($project->ID);
-		else
-			$newProject->CreatorUserName = $this->User->Name;
+		if($project = $this->getCurrentProject()) {
+					$newProject = $projectDao->getProjectByID($project->ID);
+		} else {
+					$newProject->CreatorUserName = $this->User->Name;
+		}
 			
 		$newProject->Name = $this->projectName->Text;
 		$newProject->CompletionDate = $this->completionDate->TimeStamp;
@@ -131,10 +136,11 @@ 
 		$newProject->EstimateDuration = floatval($this->estimateHours->Text);
 		$newProject->ManagerUserName = $this->manager->SelectedValue;
 		
-		if($this->currentProject)
-			$projectDao->updateProject($newProject);
-		else
-			$projectDao->addNewProject($newProject);
+		if($this->currentProject) {
+					$projectDao->updateProject($newProject);
+		} else {
+					$projectDao->addNewProject($newProject);
+		}
 		
 		$this->updateProjectMembers($newProject->ID);
 		
@@ -152,13 +158,14 @@ 
 		{
 			if($item->Selected)
 			{
-				if(!in_array($item->Value, $active))
-					$projectDao->addUserToProject($projectID, $item->Value);
-			}
-			else
+				if(!in_array($item->Value, $active)) {
+									$projectDao->addUserToProject($projectID, $item->Value);
+				}
+			} else
 			{
-				if(in_array($item->Value, $active))
-					$projectDao->removeUserFromProject($projectID, $item->Value);
+				if(in_array($item->Value, $active)) {
+									$projectDao->removeUserFromProject($projectID, $item->Value);
+				}
 			}
 		}
 	}

demos/time-tracker/tests/unit/BaseTestCase.php

Doc Comments +3 added lines

@@ -49,6 +49,9 @@
 			throw new Exception('unable to find script file '.$file);
 	}
 
+	/**
+	 * @param string $script
+	 */
 	protected function runScript($connection, $script)
 	{
 		$sql = file_get_contents($script);

Spacing +9 added lines, -9 removed lines

@@ -18,11 +18,11 @@ 
 	{
 		$conn = $this->sqlmap->getDbConnection();
 		$find = 'sqlite:protected';
-		if(is_int(strpos($conn->getConnectionString(),$find)))
+		if (is_int(strpos($conn->getConnectionString(), $find)))
 			$conn->ConnectionString = str_replace($find, 'sqlite:../protected', $conn->ConnectionString);
 		$conn->setActive(false);
 		$conn->setActive(true);
-		switch(strtolower($conn->getDriverName()))
+		switch (strtolower($conn->getDriverName()))
 		{
 			case 'mysql':
 			return $this->flushMySQLDatabase();
@@ -34,29 +34,29 @@ 
 	function flushSQLiteDatabase()
 	{
 		$conn = $this->sqlmap->getDbConnection();
-		$file = str_replace('sqlite:','',$conn->getConnectionString());
-		$backup = $file.'.bak';
+		$file = str_replace('sqlite:', '', $conn->getConnectionString());
+		$backup = $file . '.bak';
 		copy($backup, $file);
 	}
 
 	function flushMySQLDatabase()
 	{
 		$conn = $this->sqlmap->getDbConnection();
-		$file = Prado::getPathOfNamespace('Application.App_Data.MySQL4.mysql-reset','.sql');
-		if(is_file($file))
+		$file = Prado::getPathOfNamespace('Application.App_Data.MySQL4.mysql-reset', '.sql');
+		if (is_file($file))
 			$this->runScript($conn, $file);
 		else
-			throw new Exception('unable to find script file '.$file);
+			throw new Exception('unable to find script file ' . $file);
 	}
 
 	protected function runScript($connection, $script)
 	{
 		$sql = file_get_contents($script);
 		$lines = explode(';', $sql);
-		foreach($lines as $line)
+		foreach ($lines as $line)
 		{
 			$line = trim($line);
-			if(strlen($line) > 0)
+			if (strlen($line) > 0)
 				$connection->createCommand($line)->execute();
 		}
 	}

Braces +11 added lines, -8 removed lines

@@ -18,8 +18,9 @@ 
 	{
 		$conn = $this->sqlmap->getDbConnection();
 		$find = 'sqlite:protected';
-		if(is_int(strpos($conn->getConnectionString(),$find)))
-			$conn->ConnectionString = str_replace($find, 'sqlite:../protected', $conn->ConnectionString);
+		if(is_int(strpos($conn->getConnectionString(),$find))) {
+					$conn->ConnectionString = str_replace($find, 'sqlite:../protected', $conn->ConnectionString);
+		}
 		$conn->setActive(false);
 		$conn->setActive(true);
 		switch(strtolower($conn->getDriverName()))
@@ -43,10 +44,11 @@ 
 	{
 		$conn = $this->sqlmap->getDbConnection();
 		$file = Prado::getPathOfNamespace('Application.App_Data.MySQL4.mysql-reset','.sql');
-		if(is_file($file))
-			$this->runScript($conn, $file);
-		else
-			throw new Exception('unable to find script file '.$file);
+		if(is_file($file)) {
+					$this->runScript($conn, $file);
+		} else {
+					throw new Exception('unable to find script file '.$file);
+		}
 	}
 
 	protected function runScript($connection, $script)
@@ -56,8 +58,9 @@ 
 		foreach($lines as $line)
 		{
 			$line = trim($line);
-			if(strlen($line) > 0)
-				$connection->createCommand($line)->execute();
+			if(strlen($line) > 0) {
+							$connection->createCommand($line)->execute();
+			}
 		}
 	}
 }

demos/time-tracker/tests/unit/UserDaoTestCase.php

Doc Comments +3 added lines

@@ -22,6 +22,9 @@
 		$this->assertEqual($user->getEmailAddress(), 'admin@prado.local');
 	}
 	
+	/**
+	 * @param TimeTrackerUser $user2
+	 */
 	function assertSameUser($user1, $user2)
 	{
 		if(is_null($user1) || is_null($user2))

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once(dirname(__FILE__).'/BaseTestCase.php');
+require_once(dirname(__FILE__) . '/BaseTestCase.php');
 
 class UserDaoTestCase extends BaseTestCase
 {
@@ -16,7 +16,7 @@ 
 	
 	function assertIsAdmin($user)
 	{
-		if(!$user)
+		if (!$user)
 			return $this->fail();	
 		$this->assertEqual($user->getName(), 'admin');
 		$this->assertEqual($user->getEmailAddress(), 'admin@prado.local');
@@ -24,7 +24,7 @@ 
 	
 	function assertSameUser($user1, $user2)
 	{
-		if(is_null($user1) || is_null($user2))
+		if (is_null($user1) || is_null($user2))
 			return $this->fail();
 			
 		$this->assertEqual($user1->getName(), $user2->getName());
@@ -33,7 +33,7 @@ 
 	
 	function assertIsAdminRole($user)
 	{
-		if(is_null($user))
+		if (is_null($user))
 			return $this->fail();	
 				
 		$this->assertTrue($user->isInRole('admin'));
@@ -41,7 +41,7 @@ 
 
 	function assertIsManagerRole($user)
 	{
-		if(is_null($user))
+		if (is_null($user))
 			return $this->fail();	
 				
 		$this->assertTrue($user->isInRole('manager'));
@@ -49,7 +49,7 @@ 
 
 	function assertIsConsultantRole($user)
 	{
-		if(is_null($user))
+		if (is_null($user))
 			return $this->fail();	
 				
 		$this->assertTrue($user->isInRole('consultant'));
@@ -57,7 +57,7 @@ 
 
 	function assertNotConsultantRole($user)
 	{
-		if(is_null($user))
+		if (is_null($user))
 			return $this->fail();	
 				
 		$this->assertFalse($user->isInRole('consultant'));
@@ -177,7 +177,7 @@ 
 			$this->userDao->updateUserRoles($user);
 			$this->fail();
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
 			$this->pass();
 		}

Braces +19 added lines, -14 removed lines

@@ -16,16 +16,18 @@ 
 	
 	function assertIsAdmin($user)
 	{
-		if(!$user)
-			return $this->fail();	
+		if(!$user) {
+					return $this->fail();
+		}
 		$this->assertEqual($user->getName(), 'admin');
 		$this->assertEqual($user->getEmailAddress(), 'admin@prado.local');
 	}
 	
 	function assertSameUser($user1, $user2)
 	{
-		if(is_null($user1) || is_null($user2))
-			return $this->fail();
+		if(is_null($user1) || is_null($user2)) {
+					return $this->fail();
+		}
 			
 		$this->assertEqual($user1->getName(), $user2->getName());
 		$this->assertEqual($user1->getEmailAddress(), $user2->getEmailAddress());
@@ -33,32 +35,36 @@ 
 	
 	function assertIsAdminRole($user)
 	{
-		if(is_null($user))
-			return $this->fail();	
+		if(is_null($user)) {
+					return $this->fail();
+		}
 				
 		$this->assertTrue($user->isInRole('admin'));
 	}
 
 	function assertIsManagerRole($user)
 	{
-		if(is_null($user))
-			return $this->fail();	
+		if(is_null($user)) {
+					return $this->fail();
+		}
 				
 		$this->assertTrue($user->isInRole('manager'));
 	}
 
 	function assertIsConsultantRole($user)
 	{
-		if(is_null($user))
-			return $this->fail();	
+		if(is_null($user)) {
+					return $this->fail();
+		}
 				
 		$this->assertTrue($user->isInRole('consultant'));
 	}
 
 	function assertNotConsultantRole($user)
 	{
-		if(is_null($user))
-			return $this->fail();	
+		if(is_null($user)) {
+					return $this->fail();
+		}
 				
 		$this->assertFalse($user->isInRole('consultant'));
 	}
@@ -176,8 +182,7 @@ 
 		{
 			$this->userDao->updateUserRoles($user);
 			$this->fail();
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			$this->pass();
 		}

framework/3rdParty/FirePHPCore/fb.php

Doc Comments +1 added lines, -3 removed lines

@@ -50,7 +50,6 @@ 
  * "Server" request tab.
  * 
  * @see http://www.firephp.org/Wiki/Reference/Fb
- * @param mixed $Object
  * @return true
  * @throws Exception
  */
@@ -130,7 +129,6 @@ 
    * Log object to firebug
    * 
    * @see http://www.firephp.org/Wiki/Reference/Fb
-   * @param mixed $Object
    * @return true
    * @throws Exception
    */
@@ -150,7 +148,7 @@ 
    *
    * @param string $Name
    * @param array $Options OPTIONAL Instructions on how to log the group
-   * @return true
+   * @return boolean
    */
   public static function group($Name, $Options=null) {
     $instance = FirePHP::getInstance(true);

Indentation +23 added lines, -23 removed lines

@@ -73,8 +73,8 @@ 
    * @return void
    */
   public static function setEnabled($Enabled) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setEnabled($Enabled);
+	$instance = FirePHP::getInstance(true);
+	$instance->setEnabled($Enabled);
   }
   
   /**
@@ -84,8 +84,8 @@ 
    * @return boolean TRUE if enabled
    */
   public static function getEnabled() {
-    $instance = FirePHP::getInstance(true);
-    return $instance->getEnabled();
+	$instance = FirePHP::getInstance(true);
+	return $instance->getEnabled();
   }  
   
   /**
@@ -99,8 +99,8 @@ 
    * @return void
    */
   public static function setObjectFilter($Class, $Filter) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setObjectFilter($Class, $Filter);
+	$instance = FirePHP::getInstance(true);
+	$instance->setObjectFilter($Class, $Filter);
   }
   
   /**
@@ -111,8 +111,8 @@ 
    * @return void
    */
   public static function setOptions($Options) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setOptions($Options);
+	$instance = FirePHP::getInstance(true);
+	$instance->setOptions($Options);
   }
 
   /**
@@ -122,8 +122,8 @@ 
    * @return array The options
    */
   public static function getOptions() {
-    $instance = FirePHP::getInstance(true);
-    return $instance->getOptions();
+	$instance = FirePHP::getInstance(true);
+	return $instance->getOptions();
   }
 
   /**
@@ -136,9 +136,9 @@ 
    */
   public static function send()
   {
-    $instance = FirePHP::getInstance(true);
-    $args = func_get_args();
-    return call_user_func_array(array($instance,'fb'),$args);
+	$instance = FirePHP::getInstance(true);
+	$args = func_get_args();
+	return call_user_func_array(array($instance,'fb'),$args);
   }
 
   /**
@@ -153,8 +153,8 @@ 
    * @return true
    */
   public static function group($Name, $Options=null) {
-    $instance = FirePHP::getInstance(true);
-    return $instance->group($Name, $Options);
+	$instance = FirePHP::getInstance(true);
+	return $instance->group($Name, $Options);
   }
 
   /**
@@ -164,7 +164,7 @@ 
    * @throws Exception
    */
   public static function groupEnd() {
-    return self::send(null, null, FirePHP::GROUP_END);
+	return self::send(null, null, FirePHP::GROUP_END);
   }
 
   /**
@@ -177,7 +177,7 @@ 
    * @throws Exception
    */
   public static function log($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::LOG);
+	return self::send($Object, $Label, FirePHP::LOG);
   } 
 
   /**
@@ -190,7 +190,7 @@ 
    * @throws Exception
    */
   public static function info($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::INFO);
+	return self::send($Object, $Label, FirePHP::INFO);
   } 
 
   /**
@@ -203,7 +203,7 @@ 
    * @throws Exception
    */
   public static function warn($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::WARN);
+	return self::send($Object, $Label, FirePHP::WARN);
   } 
 
   /**
@@ -216,7 +216,7 @@ 
    * @throws Exception
    */
   public static function error($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::ERROR);
+	return self::send($Object, $Label, FirePHP::ERROR);
   } 
 
   /**
@@ -229,7 +229,7 @@ 
    * @throws Exception
    */
   public static function dump($Key, $Variable) {
-    return self::send($Variable, $Key, FirePHP::DUMP);
+	return self::send($Variable, $Key, FirePHP::DUMP);
   } 
 
   /**
@@ -241,7 +241,7 @@ 
    * @throws Exception
    */
   public static function trace($Label) {
-    return self::send($Label, FirePHP::TRACE);
+	return self::send($Label, FirePHP::TRACE);
   } 
 
   /**
@@ -254,7 +254,7 @@ 
    * @throws Exception
    */
   public static function table($Label, $Table) {
-    return self::send($Table, $Label, FirePHP::TABLE);
+	return self::send($Table, $Label, FirePHP::TABLE);
   } 
 
 }

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
  * @package     FirePHP
  */
 
-require_once dirname(__FILE__).'/FirePHP.class.php';
+require_once dirname(__FILE__) . '/FirePHP.class.php';
 
 /**
  * Sends the given data to the FirePHP Firefox Extension.
@@ -59,7 +59,7 @@ 
   $instance = FirePHP::getInstance(true);
   
   $args = func_get_args();
-  return call_user_func_array(array($instance,'fb'),$args);
+  return call_user_func_array(array($instance, 'fb'), $args);
 }
 
 
@@ -138,7 +138,7 @@ 
   {
     $instance = FirePHP::getInstance(true);
     $args = func_get_args();
-    return call_user_func_array(array($instance,'fb'),$args);
+    return call_user_func_array(array($instance, 'fb'), $args);
   }
 
   /**
@@ -152,7 +152,7 @@ 
    * @param array $Options OPTIONAL Instructions on how to log the group
    * @return true
    */
-  public static function group($Name, $Options=null) {
+  public static function group($Name, $Options = null) {
     $instance = FirePHP::getInstance(true);
     return $instance->group($Name, $Options);
   }
@@ -176,7 +176,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function log($Object, $Label=null) {
+  public static function log($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::LOG);
   } 
 
@@ -189,7 +189,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function info($Object, $Label=null) {
+  public static function info($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::INFO);
   } 
 
@@ -202,7 +202,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function warn($Object, $Label=null) {
+  public static function warn($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::WARN);
   } 
 
@@ -215,7 +215,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function error($Object, $Label=null) {
+  public static function error($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::ERROR);
   } 
 

framework/3rdParty/FirePHPCore/FirePHP.class.php

Doc Comments +14 added lines, -15 removed lines

@@ -226,7 +226,7 @@ 
   /**
    * When the object gets serialized only include specific object members.
    * 
-   * @return array
+   * @return string[]
    */  
   public function __sleep() {
     return array('options','objectFilters','enabled');
@@ -316,7 +316,7 @@ 
    * 
    * Will throw exceptions for each php error.
    * 
-   * @return mixed Returns a string containing the previously defined error handler (if any)
+   * @return null|callable Returns a string containing the previously defined error handler (if any)
    */
   public function registerErrorHandler($throwErrorExceptions=true)
   {
@@ -362,7 +362,7 @@ 
   /**
    * Register FirePHP as your exception handler
    * 
-   * @return mixed Returns the name of the previously defined exception handler,
+   * @return callable Returns the name of the previously defined exception handler,
    *               or NULL on error.
    *               If no previous handler was defined, NULL is also returned.
    */
@@ -467,7 +467,7 @@ 
    *
    * @param string $Name
    * @param array $Options OPTIONAL Instructions on how to log the group
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function group($Name, $Options=null) {
@@ -491,7 +491,7 @@ 
   /**
    * Ends a group you have started before
    *
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function groupEnd() {
@@ -502,9 +502,9 @@ 
    * Log object with label to firebug console
    *
    * @see FirePHP::LOG
-   * @param mixes $Object
+   * @param string $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function log($Object, $Label=null) {
@@ -517,7 +517,7 @@ 
    * @see FirePHP::INFO
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function info($Object, $Label=null) {
@@ -530,7 +530,7 @@ 
    * @see FirePHP::WARN
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function warn($Object, $Label=null) {
@@ -543,7 +543,7 @@ 
    * @see FirePHP::ERROR
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function error($Object, $Label=null) {
@@ -556,7 +556,7 @@ 
    * @see FirePHP::DUMP
    * @param string $Key
    * @param mixed $Variable
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function dump($Key, $Variable) {
@@ -568,7 +568,7 @@ 
    *
    * @see FirePHP::TRACE
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function trace($Label) {
@@ -581,7 +581,7 @@ 
    * @see FirePHP::TABLE
    * @param string $Label
    * @param string $Table
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function table($Label, $Table) {
@@ -607,7 +607,7 @@ 
    * 
    * @see http://www.firephp.org/Wiki/Reference/Fb
    * @param mixed $Object The variable to be logged
-   * @return true Return TRUE if message was added to headers, FALSE otherwise
+   * @return boolean Return TRUE if message was added to headers, FALSE otherwise
    * @throws Exception
    */
   public function fb($Object) {
@@ -1005,7 +1005,6 @@ 
    * protected and private visibility
    * 
    * @param Object $Object The object to be encoded
-   * @param int $Depth The current traversal depth
    * @return array All members of the object
    */
   protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1)

Spacing +185 added lines, -185 removed lines

@@ -229,7 +229,7 @@ 
    * @return array
    */  
   public function __sleep() {
-    return array('options','objectFilters','enabled');
+    return array('options', 'objectFilters', 'enabled');
   }
     
   /**
@@ -238,8 +238,8 @@ 
    * @param boolean $AutoCreate
    * @return FirePHP
    */
-  public static function getInstance($AutoCreate=false) {
-    if($AutoCreate===true && !self::$instance) {
+  public static function getInstance($AutoCreate = false) {
+    if ($AutoCreate === true && !self::$instance) {
       self::init();
     }
     return self::$instance;
@@ -299,7 +299,7 @@ 
    * @return void
    */
   public function setOptions($Options) {
-    $this->options = array_merge($this->options,$Options);
+    $this->options = array_merge($this->options, $Options);
   }
   
   /**
@@ -318,7 +318,7 @@ 
    * 
    * @return mixed Returns a string containing the previously defined error handler (if any)
    */
-  public function registerErrorHandler($throwErrorExceptions=true)
+  public function registerErrorHandler($throwErrorExceptions = true)
   {
     //NOTE: The following errors will not be caught by this error handler:
     //      E_ERROR, E_PARSE, E_CORE_ERROR,
@@ -327,7 +327,7 @@ 
     
     $this->throwErrorExceptions = $throwErrorExceptions;
     
-    return set_error_handler(array($this,'errorHandler'));     
+    return set_error_handler(array($this, 'errorHandler'));     
   }
 
   /**
@@ -351,7 +351,7 @@ 
     if (error_reporting() & $errno) {
 
       $exception = new ErrorException($errstr, 0, $errno, $errfile, $errline);
-      if($this->throwErrorExceptions) {
+      if ($this->throwErrorExceptions) {
         throw $exception;
       } else {
         $this->fb($exception);
@@ -368,7 +368,7 @@ 
    */
   public function registerExceptionHandler()
   {
-    return set_exception_handler(array($this,'exceptionHandler'));     
+    return set_exception_handler(array($this, 'exceptionHandler'));     
   }
   
   /**
@@ -397,12 +397,12 @@ 
    * @param boolean $throwAssertionExceptions
    * @return mixed Returns the original setting or FALSE on errors
    */
-  public function registerAssertionHandler($convertAssertionErrorsToExceptions=true, $throwAssertionExceptions=false)
+  public function registerAssertionHandler($convertAssertionErrorsToExceptions = true, $throwAssertionExceptions = false)
   {
     $this->convertAssertionErrorsToExceptions = $convertAssertionErrorsToExceptions;
     $this->throwAssertionExceptions = $throwAssertionExceptions;
     
-    if($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
+    if ($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
       throw $this->newException('Cannot throw assertion exceptions as assertion errors are not being converted to exceptions!');
     }
     
@@ -421,11 +421,11 @@ 
   public function assertionHandler($file, $line, $code)
   {
 
-    if($this->convertAssertionErrorsToExceptions) {
+    if ($this->convertAssertionErrorsToExceptions) {
       
-      $exception = new ErrorException('Assertion Failed - Code[ '.$code.' ]', 0, null, $file, $line);
+      $exception = new ErrorException('Assertion Failed - Code[ ' . $code . ' ]', 0, null, $file, $line);
 
-      if($this->throwAssertionExceptions) {
+      if ($this->throwAssertionExceptions) {
         throw $exception;
       } else {
         $this->fb($exception);
@@ -433,7 +433,7 @@ 
     
     } else {
     
-      $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file,'Line'=>$line));
+      $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file, 'Line'=>$line));
     
     }
   }  
@@ -470,18 +470,18 @@ 
    * @return true
    * @throws Exception
    */
-  public function group($Name, $Options=null) {
+  public function group($Name, $Options = null) {
     
-    if(!$Name) {
+    if (!$Name) {
       throw $this->newException('You must specify a label for the group!');
     }
     
-    if($Options) {
-      if(!is_array($Options)) {
+    if ($Options) {
+      if (!is_array($Options)) {
         throw $this->newException('Options must be defined as an array!');
       }
-      if(array_key_exists('Collapsed', $Options)) {
-        $Options['Collapsed'] = ($Options['Collapsed'])?'true':'false';
+      if (array_key_exists('Collapsed', $Options)) {
+        $Options['Collapsed'] = ($Options['Collapsed']) ? 'true' : 'false';
       }
     }
     
@@ -507,7 +507,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function log($Object, $Label=null) {
+  public function log($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::LOG);
   } 
 
@@ -520,7 +520,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function info($Object, $Label=null) {
+  public function info($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::INFO);
   } 
 
@@ -533,7 +533,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function warn($Object, $Label=null) {
+  public function warn($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::WARN);
   } 
 
@@ -546,7 +546,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function error($Object, $Label=null) {
+  public function error($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::ERROR);
   } 
 
@@ -595,8 +595,8 @@ 
    */
   public function detectClientExtension() {
     /* Check if FirePHP is installed on client */
-    if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
-       !version_compare($m[1][0],'0.0.6','>=')) {
+    if (!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si', $this->getUserAgent(), $m) ||
+       !version_compare($m[1][0], '0.0.6', '>=')) {
       return false;
     }
     return true;    
@@ -612,17 +612,17 @@ 
    */
   public function fb($Object) {
   
-    if(!$this->enabled) {
+    if (!$this->enabled) {
       return false;
     }
   
     if (headers_sent($filename, $linenum)) {
       // If we are logging from within the exception handler we cannot throw another exception
-      if($this->inExceptionHandler) {
+      if ($this->inExceptionHandler) {
         // Simply echo the error out to the page
-        echo '<div style="border: 2px solid red; font-family: Arial; font-size: 12px; background-color: lightgray; padding: 5px;"><span style="color: red; font-weight: bold;">FirePHP ERROR:</span> Headers already sent in <b>'.$filename.'</b> on line <b>'.$linenum.'</b>. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.</div>';
+        echo '<div style="border: 2px solid red; font-family: Arial; font-size: 12px; background-color: lightgray; padding: 5px;"><span style="color: red; font-weight: bold;">FirePHP ERROR:</span> Headers already sent in <b>' . $filename . '</b> on line <b>' . $linenum . '</b>. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.</div>';
       } else {
-        throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
+        throw $this->newException('Headers already sent in ' . $filename . ' on line ' . $linenum . '. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
       }
     }
   
@@ -630,10 +630,10 @@ 
     $Label = null;
     $Options = array();
   
-    if(func_num_args()==1) {
+    if (func_num_args() == 1) {
     } else
-    if(func_num_args()==2) {
-      switch(func_get_arg(1)) {
+    if (func_num_args() == 2) {
+      switch (func_get_arg(1)) {
         case self::LOG:
         case self::INFO:
         case self::WARN:
@@ -651,11 +651,11 @@ 
           break;
       }
     } else
-    if(func_num_args()==3) {
+    if (func_num_args() == 3) {
       $Type = func_get_arg(2);
       $Label = func_get_arg(1);
     } else
-    if(func_num_args()==4) {
+    if (func_num_args() == 4) {
       $Type = func_get_arg(2);
       $Label = func_get_arg(1);
       $Options = func_get_arg(3);
@@ -664,27 +664,27 @@ 
     }
   
   
-    if(!$this->detectClientExtension()) {
+    if (!$this->detectClientExtension()) {
       return false;
     }
   
     $meta = array();
     $skipFinalObjectEncode = false;
   
-    if($Object instanceof Exception) {
+    if ($Object instanceof Exception) {
 
       $meta['file'] = $this->_escapeTraceFile($Object->getFile());
       $meta['line'] = $Object->getLine();
       
       $trace = $Object->getTrace();
-      if($Object instanceof ErrorException
+      if ($Object instanceof ErrorException
          && isset($trace[0]['function'])
-         && $trace[0]['function']=='errorHandler'
+         && $trace[0]['function'] == 'errorHandler'
          && isset($trace[0]['class'])
-         && $trace[0]['class']=='FirePHP') {
+         && $trace[0]['class'] == 'FirePHP') {
            
         $severity = false;
-        switch($Object->getSeverity()) {
+        switch ($Object->getSeverity()) {
           case E_WARNING: $severity = 'E_WARNING'; break;
           case E_NOTICE: $severity = 'E_NOTICE'; break;
           case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
@@ -697,11 +697,11 @@ 
         }
            
         $Object = array('Class'=>get_class($Object),
-                        'Message'=>$severity.': '.$Object->getMessage(),
+                        'Message'=>$severity . ': ' . $Object->getMessage(),
                         'File'=>$this->_escapeTraceFile($Object->getFile()),
                         'Line'=>$Object->getLine(),
                         'Type'=>'trigger',
-                        'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
+                        'Trace'=>$this->_escapeTrace(array_splice($trace, 2)));
         $skipFinalObjectEncode = true;
       } else {
         $Object = array('Class'=>get_class($Object),
@@ -715,49 +715,49 @@ 
       $Type = self::EXCEPTION;
       
     } else
-    if($Type==self::TRACE) {
+    if ($Type == self::TRACE) {
       
       $trace = debug_backtrace();
-      if(!$trace) return false;
-      for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
+      if (!$trace) return false;
+      for ($i = 0; $i < sizeof($trace); $i++) {
 
-        if(isset($trace[$i]['class'])
+        if (isset($trace[$i]['class'])
            && isset($trace[$i]['file'])
-           && ($trace[$i]['class']=='FirePHP'
-               || $trace[$i]['class']=='FB')
-           && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-               || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+           && ($trace[$i]['class'] == 'FirePHP'
+               || $trace[$i]['class'] == 'FB')
+           && (substr($this->_standardizePath($trace[$i]['file']), -18, 18) == 'FirePHPCore/fb.php'
+               || substr($this->_standardizePath($trace[$i]['file']), -29, 29) == 'FirePHPCore/FirePHP.class.php')) {
           /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
         } else
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i+1]['file'])
-           && $trace[$i]['class']=='FirePHP'
-           && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+        if (isset($trace[$i]['class'])
+           && isset($trace[$i + 1]['file'])
+           && $trace[$i]['class'] == 'FirePHP'
+           && substr($this->_standardizePath($trace[$i + 1]['file']), -18, 18) == 'FirePHPCore/fb.php') {
           /* Skip fb() */
         } else
-        if($trace[$i]['function']=='fb'
-           || $trace[$i]['function']=='trace'
-           || $trace[$i]['function']=='send') {
-          $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
-                          'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
-                          'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
+        if ($trace[$i]['function'] == 'fb'
+           || $trace[$i]['function'] == 'trace'
+           || $trace[$i]['function'] == 'send') {
+          $Object = array('Class'=>isset($trace[$i]['class']) ? $trace[$i]['class'] : '',
+                          'Type'=>isset($trace[$i]['type']) ? $trace[$i]['type'] : '',
+                          'Function'=>isset($trace[$i]['function']) ? $trace[$i]['function'] : '',
                           'Message'=>$trace[$i]['args'][0],
-                          'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
-                          'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
-                          'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
-                          'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
+                          'File'=>isset($trace[$i]['file']) ? $this->_escapeTraceFile($trace[$i]['file']) : '',
+                          'Line'=>isset($trace[$i]['line']) ? $trace[$i]['line'] : '',
+                          'Args'=>isset($trace[$i]['args']) ? $this->encodeObject($trace[$i]['args']) : '',
+                          'Trace'=>$this->_escapeTrace(array_splice($trace, $i + 1)));
 
           $skipFinalObjectEncode = true;
-          $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-          $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+          $meta['file'] = isset($trace[$i]['file']) ? $this->_escapeTraceFile($trace[$i]['file']) : '';
+          $meta['line'] = isset($trace[$i]['line']) ? $trace[$i]['line'] : '';
           break;
         }
       }
 
     } else
-    if($Type==self::TABLE) {
+    if ($Type == self::TABLE) {
       
-      if(isset($Object[0]) && is_string($Object[0])) {
+      if (isset($Object[0]) && is_string($Object[0])) {
         $Object[1] = $this->encodeTable($Object[1]);
       } else {
         $Object = $this->encodeTable($Object);
@@ -766,44 +766,44 @@ 
       $skipFinalObjectEncode = true;
       
     } else
-    if($Type==self::GROUP_START) {
+    if ($Type == self::GROUP_START) {
       
-      if(!$Label) {
+      if (!$Label) {
         throw $this->newException('You must specify a label for the group!');
       }
       
     } else {
-      if($Type===null) {
+      if ($Type === null) {
         $Type = self::LOG;
       }
     }
     
-    if($this->options['includeLineNumbers']) {
-      if(!isset($meta['file']) || !isset($meta['line'])) {
+    if ($this->options['includeLineNumbers']) {
+      if (!isset($meta['file']) || !isset($meta['line'])) {
 
         $trace = debug_backtrace();
-        for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
+        for ($i = 0; $trace && $i < sizeof($trace); $i++) {
   
-          if(isset($trace[$i]['class'])
+          if (isset($trace[$i]['class'])
              && isset($trace[$i]['file'])
-             && ($trace[$i]['class']=='FirePHP'
-                 || $trace[$i]['class']=='FB')
-             && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-                 || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+             && ($trace[$i]['class'] == 'FirePHP'
+                 || $trace[$i]['class'] == 'FB')
+             && (substr($this->_standardizePath($trace[$i]['file']), -18, 18) == 'FirePHPCore/fb.php'
+                 || substr($this->_standardizePath($trace[$i]['file']), -29, 29) == 'FirePHPCore/FirePHP.class.php')) {
             /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
           } else
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i+1]['file'])
-             && $trace[$i]['class']=='FirePHP'
-             && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+          if (isset($trace[$i]['class'])
+             && isset($trace[$i + 1]['file'])
+             && $trace[$i]['class'] == 'FirePHP'
+             && substr($this->_standardizePath($trace[$i + 1]['file']), -18, 18) == 'FirePHPCore/fb.php') {
             /* Skip fb() */
           } else
-          if(isset($trace[$i]['file'])
-             && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
+          if (isset($trace[$i]['file'])
+             && substr($this->_standardizePath($trace[$i]['file']), -18, 18) == 'FirePHPCore/fb.php') {
             /* Skip FB::fb() */
           } else {
-            $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-            $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+            $meta['file'] = isset($trace[$i]['file']) ? $this->_escapeTraceFile($trace[$i]['file']) : '';
+            $meta['line'] = isset($trace[$i]['line']) ? $trace[$i]['line'] : '';
             break;
           }
         }      
@@ -814,49 +814,49 @@ 
       unset($meta['line']);
     }
 
-  	$this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
-  	$this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
+  	$this->setHeader('X-Wf-Protocol-1', 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
+  	$this->setHeader('X-Wf-1-Plugin-1', 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/' . self::VERSION);
  
     $structure_index = 1;
-    if($Type==self::DUMP) {
+    if ($Type == self::DUMP) {
       $structure_index = 2;
-    	$this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
+    	$this->setHeader('X-Wf-1-Structure-2', 'http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
     } else {
-    	$this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
+    	$this->setHeader('X-Wf-1-Structure-1', 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
     }
   
-    if($Type==self::DUMP) {
-    	$msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
+    if ($Type == self::DUMP) {
+    	$msg = '{"' . $Label . '":' . $this->jsonEncode($Object, $skipFinalObjectEncode) . '}';
     } else {
       $msg_meta = $Options;
       $msg_meta['Type'] = $Type;
-      if($Label!==null) {
+      if ($Label !== null) {
         $msg_meta['Label'] = $Label;
       }
-      if(isset($meta['file']) && !isset($msg_meta['File'])) {
+      if (isset($meta['file']) && !isset($msg_meta['File'])) {
         $msg_meta['File'] = $meta['file'];
       }
-      if(isset($meta['line']) && !isset($msg_meta['Line'])) {
+      if (isset($meta['line']) && !isset($msg_meta['Line'])) {
         $msg_meta['Line'] = $meta['line'];
       }
-    	$msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
+    	$msg = '[' . $this->jsonEncode($msg_meta) . ',' . $this->jsonEncode($Object, $skipFinalObjectEncode) . ']';
     }
     
-    $parts = explode("\n",chunk_split($msg, 5000, "\n"));
+    $parts = explode("\n", chunk_split($msg, 5000, "\n"));
 
-    for( $i=0 ; $i<count($parts) ; $i++) {
+    for ($i = 0; $i < count($parts); $i++) {
         
         $part = $parts[$i];
         if ($part) {
             
-            if(count($parts)>2) {
+            if (count($parts) > 2) {
               // Message needs to be split into multiple parts
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               (($i==0)?strlen($msg):'')
+              $this->setHeader('X-Wf-1-' . $structure_index . '-' . '1-' . $this->messageIndex,
+                               (($i == 0) ? strlen($msg) : '')
                                . '|' . $part . '|'
-                               . (($i<count($parts)-2)?'\\':''));
+                               . (($i < count($parts) - 2) ? '\\' : ''));
             } else {
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
+              $this->setHeader('X-Wf-1-' . $structure_index . '-' . '1-' . $this->messageIndex,
                                strlen($part) . '|' . $part . '|');
             }
             
@@ -868,7 +868,7 @@ 
         }
     }
 
-  	$this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
+  	$this->setHeader('X-Wf-1-Index', $this->messageIndex - 1);
 
     return true;
   }
@@ -880,7 +880,7 @@ 
    * @return string
    */
   protected function _standardizePath($Path) {
-    return preg_replace('/\\\\+/','/',$Path);    
+    return preg_replace('/\\\\+/', '/', $Path);    
   }
   
   /**
@@ -890,12 +890,12 @@ 
    * @return array
    */
   protected function _escapeTrace($Trace) {
-    if(!$Trace) return $Trace;
-    for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
-      if(isset($Trace[$i]['file'])) {
+    if (!$Trace) return $Trace;
+    for ($i = 0; $i < sizeof($Trace); $i++) {
+      if (isset($Trace[$i]['file'])) {
         $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
       }
-      if(isset($Trace[$i]['args'])) {
+      if (isset($Trace[$i]['args'])) {
         $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
       }
     }
@@ -910,10 +910,10 @@ 
    */
   protected function _escapeTraceFile($File) {
     /* Check if we have a windows filepath */
-    if(strpos($File,'\\')) {
+    if (strpos($File, '\\')) {
       /* First strip down to single \ */
       
-      $file = preg_replace('/\\\\+/','\\',$File);
+      $file = preg_replace('/\\\\+/', '\\', $File);
       
       return $file;
     }
@@ -927,7 +927,7 @@ 
    * @param string_type $Value
    */
   protected function setHeader($Name, $Value) {
-    return header($Name.': '.$Value);
+    return header($Name . ': ' . $Value);
   }
 
   /**
@@ -936,7 +936,7 @@ 
    * @return string|false
    */
   protected function getUserAgent() {
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+    if (!isset($_SERVER['HTTP_USER_AGENT'])) return false;
     return $_SERVER['HTTP_USER_AGENT'];
   }
 
@@ -958,14 +958,14 @@ 
    * @param object $Object The object to be encoded
    * @return string The JSON string
    */
-  public function jsonEncode($Object, $skipObjectEncode=false)
+  public function jsonEncode($Object, $skipObjectEncode = false)
   {
-    if(!$skipObjectEncode) {
+    if (!$skipObjectEncode) {
       $Object = $this->encodeObject($Object);
     }
     
-    if(function_exists('json_encode')
-       && $this->options['useNativeJsonEncode']!=false) {
+    if (function_exists('json_encode')
+       && $this->options['useNativeJsonEncode'] != false) {
 
       return json_encode($Object);
     } else {
@@ -981,15 +981,15 @@ 
    */  
   protected function encodeTable($Table) {
     
-    if(!$Table) return $Table;
+    if (!$Table) return $Table;
     
     $new_table = array();
-    foreach($Table as $row) {
+    foreach ($Table as $row) {
   
-      if(is_array($row)) {
+      if (is_array($row)) {
         $new_row = array();
         
-        foreach($row as $item) {
+        foreach ($row as $item) {
           $new_row[] = $this->encodeObject($item);
         }
         
@@ -1014,18 +1014,18 @@ 
 
     if (is_resource($Object)) {
 
-      return '** '.(string)$Object.' **';
+      return '** ' . (string) $Object . ' **';
 
     } else    
     if (is_object($Object)) {
 
         if ($ObjectDepth > $this->options['maxObjectDepth']) {
-          return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
+          return '** Max Object Depth (' . $this->options['maxObjectDepth'] . ') **';
         }
         
         foreach ($this->objectStack as $refVal) {
             if ($refVal === $Object) {
-                return '** Recursion ('.get_class($Object).') **';
+                return '** Recursion (' . get_class($Object) . ') **';
             }
         }
         array_push($this->objectStack, $Object);
@@ -1034,45 +1034,45 @@ 
 
         $reflectionClass = new ReflectionClass($class);  
         $properties = array();
-        foreach( $reflectionClass->getProperties() as $property) {
+        foreach ($reflectionClass->getProperties() as $property) {
           $properties[$property->getName()] = $property;
         }
             
-        $members = (array)$Object;
+        $members = (array) $Object;
             
-        foreach( $properties as $raw_name => $property ) {
+        foreach ($properties as $raw_name => $property) {
           
           $name = $raw_name;
-          if($property->isStatic()) {
-            $name = 'static:'.$name;
+          if ($property->isStatic()) {
+            $name = 'static:' . $name;
           }
-          if($property->isPublic()) {
-            $name = 'public:'.$name;
+          if ($property->isPublic()) {
+            $name = 'public:' . $name;
           } else
-          if($property->isPrivate()) {
-            $name = 'private:'.$name;
-            $raw_name = "\0".$class."\0".$raw_name;
+          if ($property->isPrivate()) {
+            $name = 'private:' . $name;
+            $raw_name = "\0" . $class . "\0" . $raw_name;
           } else
-          if($property->isProtected()) {
-            $name = 'protected:'.$name;
-            $raw_name = "\0".'*'."\0".$raw_name;
+          if ($property->isProtected()) {
+            $name = 'protected:' . $name;
+            $raw_name = "\0" . '*' . "\0" . $raw_name;
           }
           
-          if(!(isset($this->objectFilters[$class])
+          if (!(isset($this->objectFilters[$class])
                && is_array($this->objectFilters[$class])
-               && in_array($raw_name,$this->objectFilters[$class]))) {
+               && in_array($raw_name, $this->objectFilters[$class]))) {
 
-            if(array_key_exists($raw_name,$members)
+            if (array_key_exists($raw_name, $members)
                && !$property->isStatic()) {
               
               $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);      
             
             } else {
-              if(method_exists($property,'setAccessible')) {
+              if (method_exists($property, 'setAccessible')) {
                 $property->setAccessible(true);
                 $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
               } else
-              if($property->isPublic()) {
+              if ($property->isPublic()) {
                 $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
               } else {
                 $return[$name] = '** Need PHP 5.3 to get value **';
@@ -1085,7 +1085,7 @@ 
         
         // Include all members that are not defined in the class
         // but exist in the object
-        foreach( $members as $raw_name => $value ) {
+        foreach ($members as $raw_name => $value) {
           
           $name = $raw_name;
           
@@ -1094,12 +1094,12 @@ 
             $name = $parts[2];
           }
           
-          if(!isset($properties[$name])) {
-            $name = 'undeclared:'.$name;
+          if (!isset($properties[$name])) {
+            $name = 'undeclared:' . $name;
               
-            if(!(isset($this->objectFilters[$class])
+            if (!(isset($this->objectFilters[$class])
                  && is_array($this->objectFilters[$class])
-                 && in_array($raw_name,$this->objectFilters[$class]))) {
+                 && in_array($raw_name, $this->objectFilters[$class]))) {
               
               $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
             } else {
@@ -1113,7 +1113,7 @@ 
     } elseif (is_array($Object)) {
 
         if ($ArrayDepth > $this->options['maxArrayDepth']) {
-          return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
+          return '** Max Array Depth (' . $this->options['maxArrayDepth'] . ') **';
         }
       
         foreach ($Object as $key => $val) {
@@ -1122,16 +1122,16 @@ 
           // if the recursion is not reset here as it contains
           // a reference to itself. This is the only way I have come up
           // with to stop infinite recursion in this case.
-          if($key=='GLOBALS'
+          if ($key == 'GLOBALS'
              && is_array($val)
-             && array_key_exists('GLOBALS',$val)) {
+             && array_key_exists('GLOBALS', $val)) {
             $val['GLOBALS'] = '** Recursion (GLOBALS) **';
           }
           
           $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
         }
     } else {
-      if(self::is_utf8($Object)) {
+      if (self::is_utf8($Object)) {
         return $Object;
       } else {
         return utf8_encode($Object);
@@ -1147,24 +1147,24 @@ 
    * @return boolean
    */
   protected static function is_utf8($str) {
-    $c=0; $b=0;
-    $bits=0;
-    $len=strlen($str);
-    for($i=0; $i<$len; $i++){
-        $c=ord($str[$i]);
-        if($c > 128){
-            if(($c >= 254)) return false;
-            elseif($c >= 252) $bits=6;
-            elseif($c >= 248) $bits=5;
-            elseif($c >= 240) $bits=4;
-            elseif($c >= 224) $bits=3;
-            elseif($c >= 192) $bits=2;
+    $c = 0; $b = 0;
+    $bits = 0;
+    $len = strlen($str);
+    for ($i = 0; $i < $len; $i++) {
+        $c = ord($str[$i]);
+        if ($c > 128) {
+            if (($c >= 254)) return false;
+            elseif ($c >= 252) $bits = 6;
+            elseif ($c >= 248) $bits = 5;
+            elseif ($c >= 240) $bits = 4;
+            elseif ($c >= 224) $bits = 3;
+            elseif ($c >= 192) $bits = 2;
             else return false;
-            if(($i+$bits) > $len) return false;
-            while($bits > 1){
+            if (($i + $bits) > $len) return false;
+            while ($bits > 1) {
                 $i++;
-                $b=ord($str[$i]);
-                if($b < 128 || $b > 191) return false;
+                $b = ord($str[$i]);
+                if ($b < 128 || $b > 191) return false;
                 $bits--;
             }
         }
@@ -1249,11 +1249,11 @@ 
   private function json_utf82utf16($utf8)
   {
       // oh please oh please oh please oh please oh please
-      if(function_exists('mb_convert_encoding')) {
+      if (function_exists('mb_convert_encoding')) {
           return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
       }
 
-      switch(strlen($utf8)) {
+      switch (strlen($utf8)) {
           case 1:
               // this case should never be reached, because we are in ASCII range
               // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -1293,8 +1293,8 @@ 
   private function json_encode($var)
   {
     
-    if(is_object($var)) {
-      if(in_array($var,$this->json_objectStack)) {
+    if (is_object($var)) {
+      if (in_array($var, $this->json_objectStack)) {
         return '"** Recursion **"';
       }
     }
@@ -1347,7 +1347,7 @@ 
                       case $ord_var_c == 0x2F:
                       case $ord_var_c == 0x5C:
                           // double quote, slash, slosh
-                          $ascii .= '\\'.$var{$c};
+                          $ascii .= '\\' . $var{$c};
                           break;
 
                       case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
@@ -1416,7 +1416,7 @@ 
                   }
               }
 
-              return '"'.$ascii.'"';
+              return '"' . $ascii . '"';
 
           case 'array':
              /*
@@ -1448,8 +1448,8 @@ 
 
                   array_pop($this->json_objectStack);
 
-                  foreach($properties as $property) {
-                      if($property instanceof Exception) {
+                  foreach ($properties as $property) {
+                      if ($property instanceof Exception) {
                           return $property;
                       }
                   }
@@ -1464,8 +1464,8 @@ 
 
               array_pop($this->json_objectStack);
 
-              foreach($elements as $element) {
-                  if($element instanceof Exception) {
+              foreach ($elements as $element) {
+                  if ($element instanceof Exception) {
                       return $element;
                   }
               }
@@ -1483,8 +1483,8 @@ 
 
               array_pop($this->json_objectStack);
               
-              foreach($properties as $property) {
-                  if($property instanceof Exception) {
+              foreach ($properties as $property) {
+                  if ($property instanceof Exception) {
                       return $property;
                   }
               }
@@ -1511,15 +1511,15 @@ 
       // if the recursion is not reset here as it contains
       // a reference to itself. This is the only way I have come up
       // with to stop infinite recursion in this case.
-      if($name=='GLOBALS'
+      if ($name == 'GLOBALS'
          && is_array($value)
-         && array_key_exists('GLOBALS',$value)) {
+         && array_key_exists('GLOBALS', $value)) {
         $value['GLOBALS'] = '** Recursion **';
       }
     
       $encoded_value = $this->json_encode($value);
 
-      if($encoded_value instanceof Exception) {
+      if ($encoded_value instanceof Exception) {
           return $encoded_value;
       }
 

Braces +33 added lines, -13 removed lines

@@ -718,7 +718,9 @@ 
     if($Type==self::TRACE) {
       
       $trace = debug_backtrace();
-      if(!$trace) return false;
+      if(!$trace) {
+      	return false;
+      }
       for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
 
         if(isset($trace[$i]['class'])
@@ -890,7 +892,9 @@ 
    * @return array
    */
   protected function _escapeTrace($Trace) {
-    if(!$Trace) return $Trace;
+    if(!$Trace) {
+    	return $Trace;
+    }
     for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
       if(isset($Trace[$i]['file'])) {
         $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
@@ -936,7 +940,9 @@ 
    * @return string|false
    */
   protected function getUserAgent() {
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+    if(!isset($_SERVER['HTTP_USER_AGENT'])) {
+    	return false;
+    }
     return $_SERVER['HTTP_USER_AGENT'];
   }
 
@@ -981,7 +987,9 @@ 
    */  
   protected function encodeTable($Table) {
     
-    if(!$Table) return $Table;
+    if(!$Table) {
+    	return $Table;
+    }
     
     $new_table = array();
     foreach($Table as $row) {
@@ -1153,18 +1161,30 @@ 
     for($i=0; $i<$len; $i++){
         $c=ord($str[$i]);
         if($c > 128){
-            if(($c >= 254)) return false;
-            elseif($c >= 252) $bits=6;
-            elseif($c >= 248) $bits=5;
-            elseif($c >= 240) $bits=4;
-            elseif($c >= 224) $bits=3;
-            elseif($c >= 192) $bits=2;
-            else return false;
-            if(($i+$bits) > $len) return false;
+            if(($c >= 254)) {
+            	return false;
+            } elseif($c >= 252) {
+            	$bits=6;
+            } elseif($c >= 248) {
+            	$bits=5;
+            } elseif($c >= 240) {
+            	$bits=4;
+            } elseif($c >= 224) {
+            	$bits=3;
+            } elseif($c >= 192) {
+            	$bits=2;
+            } else {
+            	return false;
+            }
+            if(($i+$bits) > $len) {
+            	return false;
+            }
             while($bits > 1){
                 $i++;
                 $b=ord($str[$i]);
-                if($b < 128 || $b > 191) return false;
+                if($b < 128 || $b > 191) {
+                	return false;
+                }
                 $bits--;
             }
         }

Indentation +675 added lines, -675 removed lines

@@ -192,9 +192,9 @@ 
    * @var array
    */
   protected $options = array('maxObjectDepth' => 10,
-                             'maxArrayDepth' => 20,
-                             'useNativeJsonEncode' => true,
-                             'includeLineNumbers' => true);
+							 'maxArrayDepth' => 20,
+							 'useNativeJsonEncode' => true,
+							 'includeLineNumbers' => true);
 
   /**
    * Filters used to exclude object members when encoding
@@ -229,7 +229,7 @@ 
    * @return array
    */  
   public function __sleep() {
-    return array('options','objectFilters','enabled');
+	return array('options','objectFilters','enabled');
   }
     
   /**
@@ -239,10 +239,10 @@ 
    * @return FirePHP
    */
   public static function getInstance($AutoCreate=false) {
-    if($AutoCreate===true && !self::$instance) {
-      self::init();
-    }
-    return self::$instance;
+	if($AutoCreate===true && !self::$instance) {
+	  self::init();
+	}
+	return self::$instance;
   }
    
   /**
@@ -251,7 +251,7 @@ 
    * @return FirePHP
    */
   public static function init() {
-    return self::$instance = new self();
+	return self::$instance = new self();
   }
   
   /**
@@ -261,7 +261,7 @@ 
    * @return void
    */
   public function setEnabled($Enabled) {
-    $this->enabled = $Enabled;
+	$this->enabled = $Enabled;
   }
   
   /**
@@ -270,7 +270,7 @@ 
    * @return boolean TRUE if enabled
    */
   public function getEnabled() {
-    return $this->enabled;
+	return $this->enabled;
   }
   
   /**
@@ -283,7 +283,7 @@ 
    * @return void
    */
   public function setObjectFilter($Class, $Filter) {
-    $this->objectFilters[$Class] = $Filter;
+	$this->objectFilters[$Class] = $Filter;
   }
   
   /**
@@ -299,7 +299,7 @@ 
    * @return void
    */
   public function setOptions($Options) {
-    $this->options = array_merge($this->options,$Options);
+	$this->options = array_merge($this->options,$Options);
   }
   
   /**
@@ -308,7 +308,7 @@ 
    * @return array The currently set options
    */
   public function getOptions() {
-    return $this->options;
+	return $this->options;
   }
   
   /**
@@ -320,14 +320,14 @@ 
    */
   public function registerErrorHandler($throwErrorExceptions=true)
   {
-    //NOTE: The following errors will not be caught by this error handler:
-    //      E_ERROR, E_PARSE, E_CORE_ERROR,
-    //      E_CORE_WARNING, E_COMPILE_ERROR,
-    //      E_COMPILE_WARNING, E_STRICT
+	//NOTE: The following errors will not be caught by this error handler:
+	//      E_ERROR, E_PARSE, E_CORE_ERROR,
+	//      E_CORE_WARNING, E_COMPILE_ERROR,
+	//      E_COMPILE_WARNING, E_STRICT
     
-    $this->throwErrorExceptions = $throwErrorExceptions;
+	$this->throwErrorExceptions = $throwErrorExceptions;
     
-    return set_error_handler(array($this,'errorHandler'));     
+	return set_error_handler(array($this,'errorHandler'));     
   }
 
   /**
@@ -343,20 +343,20 @@ 
    */
   public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext)
   {
-    // Don't throw exception if error reporting is switched off
-    if (error_reporting() == 0) {
-      return;
-    }
-    // Only throw exceptions for errors we are asking for
-    if (error_reporting() & $errno) {
-
-      $exception = new ErrorException($errstr, 0, $errno, $errfile, $errline);
-      if($this->throwErrorExceptions) {
-        throw $exception;
-      } else {
-        $this->fb($exception);
-      }
-    }
+	// Don't throw exception if error reporting is switched off
+	if (error_reporting() == 0) {
+	  return;
+	}
+	// Only throw exceptions for errors we are asking for
+	if (error_reporting() & $errno) {
+
+	  $exception = new ErrorException($errstr, 0, $errno, $errfile, $errline);
+	  if($this->throwErrorExceptions) {
+		throw $exception;
+	  } else {
+		$this->fb($exception);
+	  }
+	}
   }
   
   /**
@@ -368,7 +368,7 @@ 
    */
   public function registerExceptionHandler()
   {
-    return set_exception_handler(array($this,'exceptionHandler'));     
+	return set_exception_handler(array($this,'exceptionHandler'));     
   }
   
   /**
@@ -381,13 +381,13 @@ 
    */
   function exceptionHandler($Exception) {
     
-    $this->inExceptionHandler = true;
+	$this->inExceptionHandler = true;
 
-    header('HTTP/1.1 500 Internal Server Error');
+	header('HTTP/1.1 500 Internal Server Error');
 
-    $this->fb($Exception);
+	$this->fb($Exception);
     
-    $this->inExceptionHandler = false;
+	$this->inExceptionHandler = false;
   }
   
   /**
@@ -399,14 +399,14 @@ 
    */
   public function registerAssertionHandler($convertAssertionErrorsToExceptions=true, $throwAssertionExceptions=false)
   {
-    $this->convertAssertionErrorsToExceptions = $convertAssertionErrorsToExceptions;
-    $this->throwAssertionExceptions = $throwAssertionExceptions;
+	$this->convertAssertionErrorsToExceptions = $convertAssertionErrorsToExceptions;
+	$this->throwAssertionExceptions = $throwAssertionExceptions;
     
-    if($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
-      throw $this->newException('Cannot throw assertion exceptions as assertion errors are not being converted to exceptions!');
-    }
+	if($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
+	  throw $this->newException('Cannot throw assertion exceptions as assertion errors are not being converted to exceptions!');
+	}
     
-    return assert_options(ASSERT_CALLBACK, array($this, 'assertionHandler'));
+	return assert_options(ASSERT_CALLBACK, array($this, 'assertionHandler'));
   }
   
   /**
@@ -421,21 +421,21 @@ 
   public function assertionHandler($file, $line, $code)
   {
 
-    if($this->convertAssertionErrorsToExceptions) {
+	if($this->convertAssertionErrorsToExceptions) {
       
-      $exception = new ErrorException('Assertion Failed - Code[ '.$code.' ]', 0, null, $file, $line);
+	  $exception = new ErrorException('Assertion Failed - Code[ '.$code.' ]', 0, null, $file, $line);
 
-      if($this->throwAssertionExceptions) {
-        throw $exception;
-      } else {
-        $this->fb($exception);
-      }
+	  if($this->throwAssertionExceptions) {
+		throw $exception;
+	  } else {
+		$this->fb($exception);
+	  }
     
-    } else {
+	} else {
     
-      $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file,'Line'=>$line));
+	  $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file,'Line'=>$line));
     
-    }
+	}
   }  
   
   /**
@@ -445,7 +445,7 @@ 
    */    
   public function setProcessorUrl($URL)
   {
-    $this->setHeader('X-FirePHP-ProcessorURL', $URL);
+	$this->setHeader('X-FirePHP-ProcessorURL', $URL);
   }
 
   /**
@@ -455,7 +455,7 @@ 
    */
   public function setRendererUrl($URL)
   {
-    $this->setHeader('X-FirePHP-RendererURL', $URL);
+	$this->setHeader('X-FirePHP-RendererURL', $URL);
   }
   
   /**
@@ -472,20 +472,20 @@ 
    */
   public function group($Name, $Options=null) {
     
-    if(!$Name) {
-      throw $this->newException('You must specify a label for the group!');
-    }
+	if(!$Name) {
+	  throw $this->newException('You must specify a label for the group!');
+	}
     
-    if($Options) {
-      if(!is_array($Options)) {
-        throw $this->newException('Options must be defined as an array!');
-      }
-      if(array_key_exists('Collapsed', $Options)) {
-        $Options['Collapsed'] = ($Options['Collapsed'])?'true':'false';
-      }
-    }
+	if($Options) {
+	  if(!is_array($Options)) {
+		throw $this->newException('Options must be defined as an array!');
+	  }
+	  if(array_key_exists('Collapsed', $Options)) {
+		$Options['Collapsed'] = ($Options['Collapsed'])?'true':'false';
+	  }
+	}
     
-    return $this->fb(null, $Name, FirePHP::GROUP_START, $Options);
+	return $this->fb(null, $Name, FirePHP::GROUP_START, $Options);
   }
   
   /**
@@ -495,7 +495,7 @@ 
    * @throws Exception
    */
   public function groupEnd() {
-    return $this->fb(null, null, FirePHP::GROUP_END);
+	return $this->fb(null, null, FirePHP::GROUP_END);
   }
 
   /**
@@ -508,7 +508,7 @@ 
    * @throws Exception
    */
   public function log($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::LOG);
+	return $this->fb($Object, $Label, FirePHP::LOG);
   } 
 
   /**
@@ -521,7 +521,7 @@ 
    * @throws Exception
    */
   public function info($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::INFO);
+	return $this->fb($Object, $Label, FirePHP::INFO);
   } 
 
   /**
@@ -534,7 +534,7 @@ 
    * @throws Exception
    */
   public function warn($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::WARN);
+	return $this->fb($Object, $Label, FirePHP::WARN);
   } 
 
   /**
@@ -547,7 +547,7 @@ 
    * @throws Exception
    */
   public function error($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::ERROR);
+	return $this->fb($Object, $Label, FirePHP::ERROR);
   } 
 
   /**
@@ -560,7 +560,7 @@ 
    * @throws Exception
    */
   public function dump($Key, $Variable) {
-    return $this->fb($Variable, $Key, FirePHP::DUMP);
+	return $this->fb($Variable, $Key, FirePHP::DUMP);
   }
   
   /**
@@ -572,7 +572,7 @@ 
    * @throws Exception
    */
   public function trace($Label) {
-    return $this->fb($Label, FirePHP::TRACE);
+	return $this->fb($Label, FirePHP::TRACE);
   } 
 
   /**
@@ -585,7 +585,7 @@ 
    * @throws Exception
    */
   public function table($Label, $Table) {
-    return $this->fb($Table, $Label, FirePHP::TABLE);
+	return $this->fb($Table, $Label, FirePHP::TABLE);
   }
   
   /**
@@ -594,12 +594,12 @@ 
    * @return boolean
    */
   public function detectClientExtension() {
-    /* Check if FirePHP is installed on client */
-    if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
-       !version_compare($m[1][0],'0.0.6','>=')) {
-      return false;
-    }
-    return true;    
+	/* Check if FirePHP is installed on client */
+	if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
+	   !version_compare($m[1][0],'0.0.6','>=')) {
+	  return false;
+	}
+	return true;    
   }
  
   /**
@@ -612,265 +612,265 @@ 
    */
   public function fb($Object) {
   
-    if(!$this->enabled) {
-      return false;
-    }
+	if(!$this->enabled) {
+	  return false;
+	}
   
-    if (headers_sent($filename, $linenum)) {
-      // If we are logging from within the exception handler we cannot throw another exception
-      if($this->inExceptionHandler) {
-        // Simply echo the error out to the page
-        echo '<div style="border: 2px solid red; font-family: Arial; font-size: 12px; background-color: lightgray; padding: 5px;"><span style="color: red; font-weight: bold;">FirePHP ERROR:</span> Headers already sent in <b>'.$filename.'</b> on line <b>'.$linenum.'</b>. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.</div>';
-      } else {
-        throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
-      }
-    }
+	if (headers_sent($filename, $linenum)) {
+	  // If we are logging from within the exception handler we cannot throw another exception
+	  if($this->inExceptionHandler) {
+		// Simply echo the error out to the page
+		echo '<div style="border: 2px solid red; font-family: Arial; font-size: 12px; background-color: lightgray; padding: 5px;"><span style="color: red; font-weight: bold;">FirePHP ERROR:</span> Headers already sent in <b>'.$filename.'</b> on line <b>'.$linenum.'</b>. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.</div>';
+	  } else {
+		throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
+	  }
+	}
   
-    $Type = null;
-    $Label = null;
-    $Options = array();
+	$Type = null;
+	$Label = null;
+	$Options = array();
   
-    if(func_num_args()==1) {
-    } else
-    if(func_num_args()==2) {
-      switch(func_get_arg(1)) {
-        case self::LOG:
-        case self::INFO:
-        case self::WARN:
-        case self::ERROR:
-        case self::DUMP:
-        case self::TRACE:
-        case self::EXCEPTION:
-        case self::TABLE:
-        case self::GROUP_START:
-        case self::GROUP_END:
-          $Type = func_get_arg(1);
-          break;
-        default:
-          $Label = func_get_arg(1);
-          break;
-      }
-    } else
-    if(func_num_args()==3) {
-      $Type = func_get_arg(2);
-      $Label = func_get_arg(1);
-    } else
-    if(func_num_args()==4) {
-      $Type = func_get_arg(2);
-      $Label = func_get_arg(1);
-      $Options = func_get_arg(3);
-    } else {
-      throw $this->newException('Wrong number of arguments to fb() function!');
-    }
+	if(func_num_args()==1) {
+	} else
+	if(func_num_args()==2) {
+	  switch(func_get_arg(1)) {
+		case self::LOG:
+		case self::INFO:
+		case self::WARN:
+		case self::ERROR:
+		case self::DUMP:
+		case self::TRACE:
+		case self::EXCEPTION:
+		case self::TABLE:
+		case self::GROUP_START:
+		case self::GROUP_END:
+		  $Type = func_get_arg(1);
+		  break;
+		default:
+		  $Label = func_get_arg(1);
+		  break;
+	  }
+	} else
+	if(func_num_args()==3) {
+	  $Type = func_get_arg(2);
+	  $Label = func_get_arg(1);
+	} else
+	if(func_num_args()==4) {
+	  $Type = func_get_arg(2);
+	  $Label = func_get_arg(1);
+	  $Options = func_get_arg(3);
+	} else {
+	  throw $this->newException('Wrong number of arguments to fb() function!');
+	}
   
   
-    if(!$this->detectClientExtension()) {
-      return false;
-    }
+	if(!$this->detectClientExtension()) {
+	  return false;
+	}
   
-    $meta = array();
-    $skipFinalObjectEncode = false;
+	$meta = array();
+	$skipFinalObjectEncode = false;
   
-    if($Object instanceof Exception) {
+	if($Object instanceof Exception) {
 
-      $meta['file'] = $this->_escapeTraceFile($Object->getFile());
-      $meta['line'] = $Object->getLine();
+	  $meta['file'] = $this->_escapeTraceFile($Object->getFile());
+	  $meta['line'] = $Object->getLine();
       
-      $trace = $Object->getTrace();
-      if($Object instanceof ErrorException
-         && isset($trace[0]['function'])
-         && $trace[0]['function']=='errorHandler'
-         && isset($trace[0]['class'])
-         && $trace[0]['class']=='FirePHP') {
+	  $trace = $Object->getTrace();
+	  if($Object instanceof ErrorException
+		 && isset($trace[0]['function'])
+		 && $trace[0]['function']=='errorHandler'
+		 && isset($trace[0]['class'])
+		 && $trace[0]['class']=='FirePHP') {
            
-        $severity = false;
-        switch($Object->getSeverity()) {
-          case E_WARNING: $severity = 'E_WARNING'; break;
-          case E_NOTICE: $severity = 'E_NOTICE'; break;
-          case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
-          case E_USER_WARNING: $severity = 'E_USER_WARNING'; break;
-          case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break;
-          case E_STRICT: $severity = 'E_STRICT'; break;
-          case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break;
-          case E_DEPRECATED: $severity = 'E_DEPRECATED'; break;
-          case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break;
-        }
+		$severity = false;
+		switch($Object->getSeverity()) {
+		  case E_WARNING: $severity = 'E_WARNING'; break;
+		  case E_NOTICE: $severity = 'E_NOTICE'; break;
+		  case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
+		  case E_USER_WARNING: $severity = 'E_USER_WARNING'; break;
+		  case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break;
+		  case E_STRICT: $severity = 'E_STRICT'; break;
+		  case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break;
+		  case E_DEPRECATED: $severity = 'E_DEPRECATED'; break;
+		  case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break;
+		}
            
-        $Object = array('Class'=>get_class($Object),
-                        'Message'=>$severity.': '.$Object->getMessage(),
-                        'File'=>$this->_escapeTraceFile($Object->getFile()),
-                        'Line'=>$Object->getLine(),
-                        'Type'=>'trigger',
-                        'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
-        $skipFinalObjectEncode = true;
-      } else {
-        $Object = array('Class'=>get_class($Object),
-                        'Message'=>$Object->getMessage(),
-                        'File'=>$this->_escapeTraceFile($Object->getFile()),
-                        'Line'=>$Object->getLine(),
-                        'Type'=>'throw',
-                        'Trace'=>$this->_escapeTrace($trace));
-        $skipFinalObjectEncode = true;
-      }
-      $Type = self::EXCEPTION;
+		$Object = array('Class'=>get_class($Object),
+						'Message'=>$severity.': '.$Object->getMessage(),
+						'File'=>$this->_escapeTraceFile($Object->getFile()),
+						'Line'=>$Object->getLine(),
+						'Type'=>'trigger',
+						'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
+		$skipFinalObjectEncode = true;
+	  } else {
+		$Object = array('Class'=>get_class($Object),
+						'Message'=>$Object->getMessage(),
+						'File'=>$this->_escapeTraceFile($Object->getFile()),
+						'Line'=>$Object->getLine(),
+						'Type'=>'throw',
+						'Trace'=>$this->_escapeTrace($trace));
+		$skipFinalObjectEncode = true;
+	  }
+	  $Type = self::EXCEPTION;
       
-    } else
-    if($Type==self::TRACE) {
+	} else
+	if($Type==self::TRACE) {
       
-      $trace = debug_backtrace();
-      if(!$trace) return false;
-      for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
-
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i]['file'])
-           && ($trace[$i]['class']=='FirePHP'
-               || $trace[$i]['class']=='FB')
-           && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-               || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
-          /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
-        } else
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i+1]['file'])
-           && $trace[$i]['class']=='FirePHP'
-           && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
-          /* Skip fb() */
-        } else
-        if($trace[$i]['function']=='fb'
-           || $trace[$i]['function']=='trace'
-           || $trace[$i]['function']=='send') {
-          $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
-                          'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
-                          'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
-                          'Message'=>$trace[$i]['args'][0],
-                          'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
-                          'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
-                          'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
-                          'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
-
-          $skipFinalObjectEncode = true;
-          $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-          $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
-          break;
-        }
-      }
-
-    } else
-    if($Type==self::TABLE) {
+	  $trace = debug_backtrace();
+	  if(!$trace) return false;
+	  for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
+
+		if(isset($trace[$i]['class'])
+		   && isset($trace[$i]['file'])
+		   && ($trace[$i]['class']=='FirePHP'
+			   || $trace[$i]['class']=='FB')
+		   && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
+			   || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+		  /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
+		} else
+		if(isset($trace[$i]['class'])
+		   && isset($trace[$i+1]['file'])
+		   && $trace[$i]['class']=='FirePHP'
+		   && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+		  /* Skip fb() */
+		} else
+		if($trace[$i]['function']=='fb'
+		   || $trace[$i]['function']=='trace'
+		   || $trace[$i]['function']=='send') {
+		  $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
+						  'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
+						  'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
+						  'Message'=>$trace[$i]['args'][0],
+						  'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
+						  'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
+						  'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
+						  'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
+
+		  $skipFinalObjectEncode = true;
+		  $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
+		  $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+		  break;
+		}
+	  }
+
+	} else
+	if($Type==self::TABLE) {
       
-      if(isset($Object[0]) && is_string($Object[0])) {
-        $Object[1] = $this->encodeTable($Object[1]);
-      } else {
-        $Object = $this->encodeTable($Object);
-      }
+	  if(isset($Object[0]) && is_string($Object[0])) {
+		$Object[1] = $this->encodeTable($Object[1]);
+	  } else {
+		$Object = $this->encodeTable($Object);
+	  }
 
-      $skipFinalObjectEncode = true;
+	  $skipFinalObjectEncode = true;
       
-    } else
-    if($Type==self::GROUP_START) {
+	} else
+	if($Type==self::GROUP_START) {
       
-      if(!$Label) {
-        throw $this->newException('You must specify a label for the group!');
-      }
+	  if(!$Label) {
+		throw $this->newException('You must specify a label for the group!');
+	  }
       
-    } else {
-      if($Type===null) {
-        $Type = self::LOG;
-      }
-    }
+	} else {
+	  if($Type===null) {
+		$Type = self::LOG;
+	  }
+	}
     
-    if($this->options['includeLineNumbers']) {
-      if(!isset($meta['file']) || !isset($meta['line'])) {
+	if($this->options['includeLineNumbers']) {
+	  if(!isset($meta['file']) || !isset($meta['line'])) {
 
-        $trace = debug_backtrace();
-        for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
+		$trace = debug_backtrace();
+		for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
   
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i]['file'])
-             && ($trace[$i]['class']=='FirePHP'
-                 || $trace[$i]['class']=='FB')
-             && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-                 || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
-            /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
-          } else
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i+1]['file'])
-             && $trace[$i]['class']=='FirePHP'
-             && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
-            /* Skip fb() */
-          } else
-          if(isset($trace[$i]['file'])
-             && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
-            /* Skip FB::fb() */
-          } else {
-            $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-            $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
-            break;
-          }
-        }      
+		  if(isset($trace[$i]['class'])
+			 && isset($trace[$i]['file'])
+			 && ($trace[$i]['class']=='FirePHP'
+				 || $trace[$i]['class']=='FB')
+			 && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
+				 || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+			/* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
+		  } else
+		  if(isset($trace[$i]['class'])
+			 && isset($trace[$i+1]['file'])
+			 && $trace[$i]['class']=='FirePHP'
+			 && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+			/* Skip fb() */
+		  } else
+		  if(isset($trace[$i]['file'])
+			 && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
+			/* Skip FB::fb() */
+		  } else {
+			$meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
+			$meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+			break;
+		  }
+		}      
       
-      }
-    } else {
-      unset($meta['file']);
-      unset($meta['line']);
-    }
+	  }
+	} else {
+	  unset($meta['file']);
+	  unset($meta['line']);
+	}
 
   	$this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
   	$this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
  
-    $structure_index = 1;
-    if($Type==self::DUMP) {
-      $structure_index = 2;
-    	$this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
-    } else {
-    	$this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
-    }
+	$structure_index = 1;
+	if($Type==self::DUMP) {
+	  $structure_index = 2;
+		$this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
+	} else {
+		$this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
+	}
   
-    if($Type==self::DUMP) {
-    	$msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
-    } else {
-      $msg_meta = $Options;
-      $msg_meta['Type'] = $Type;
-      if($Label!==null) {
-        $msg_meta['Label'] = $Label;
-      }
-      if(isset($meta['file']) && !isset($msg_meta['File'])) {
-        $msg_meta['File'] = $meta['file'];
-      }
-      if(isset($meta['line']) && !isset($msg_meta['Line'])) {
-        $msg_meta['Line'] = $meta['line'];
-      }
-    	$msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
-    }
+	if($Type==self::DUMP) {
+		$msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
+	} else {
+	  $msg_meta = $Options;
+	  $msg_meta['Type'] = $Type;
+	  if($Label!==null) {
+		$msg_meta['Label'] = $Label;
+	  }
+	  if(isset($meta['file']) && !isset($msg_meta['File'])) {
+		$msg_meta['File'] = $meta['file'];
+	  }
+	  if(isset($meta['line']) && !isset($msg_meta['Line'])) {
+		$msg_meta['Line'] = $meta['line'];
+	  }
+		$msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
+	}
     
-    $parts = explode("\n",chunk_split($msg, 5000, "\n"));
+	$parts = explode("\n",chunk_split($msg, 5000, "\n"));
 
-    for( $i=0 ; $i<count($parts) ; $i++) {
+	for( $i=0 ; $i<count($parts) ; $i++) {
         
-        $part = $parts[$i];
-        if ($part) {
+		$part = $parts[$i];
+		if ($part) {
             
-            if(count($parts)>2) {
-              // Message needs to be split into multiple parts
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               (($i==0)?strlen($msg):'')
-                               . '|' . $part . '|'
-                               . (($i<count($parts)-2)?'\\':''));
-            } else {
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               strlen($part) . '|' . $part . '|');
-            }
+			if(count($parts)>2) {
+			  // Message needs to be split into multiple parts
+			  $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
+							   (($i==0)?strlen($msg):'')
+							   . '|' . $part . '|'
+							   . (($i<count($parts)-2)?'\\':''));
+			} else {
+			  $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
+							   strlen($part) . '|' . $part . '|');
+			}
             
-            $this->messageIndex++;
+			$this->messageIndex++;
             
-            if ($this->messageIndex > 99999) {
-                throw $this->newException('Maximum number (99,999) of messages reached!');             
-            }
-        }
-    }
+			if ($this->messageIndex > 99999) {
+				throw $this->newException('Maximum number (99,999) of messages reached!');             
+			}
+		}
+	}
 
   	$this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
 
-    return true;
+	return true;
   }
   
   /**
@@ -880,7 +880,7 @@ 
    * @return string
    */
   protected function _standardizePath($Path) {
-    return preg_replace('/\\\\+/','/',$Path);    
+	return preg_replace('/\\\\+/','/',$Path);    
   }
   
   /**
@@ -890,16 +890,16 @@ 
    * @return array
    */
   protected function _escapeTrace($Trace) {
-    if(!$Trace) return $Trace;
-    for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
-      if(isset($Trace[$i]['file'])) {
-        $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
-      }
-      if(isset($Trace[$i]['args'])) {
-        $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
-      }
-    }
-    return $Trace;    
+	if(!$Trace) return $Trace;
+	for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
+	  if(isset($Trace[$i]['file'])) {
+		$Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
+	  }
+	  if(isset($Trace[$i]['args'])) {
+		$Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
+	  }
+	}
+	return $Trace;    
   }
   
   /**
@@ -909,15 +909,15 @@ 
    * @return string
    */
   protected function _escapeTraceFile($File) {
-    /* Check if we have a windows filepath */
-    if(strpos($File,'\\')) {
-      /* First strip down to single \ */
+	/* Check if we have a windows filepath */
+	if(strpos($File,'\\')) {
+	  /* First strip down to single \ */
       
-      $file = preg_replace('/\\\\+/','\\',$File);
+	  $file = preg_replace('/\\\\+/','\\',$File);
       
-      return $file;
-    }
-    return $File;
+	  return $file;
+	}
+	return $File;
   }
 
   /**
@@ -927,7 +927,7 @@ 
    * @param string_type $Value
    */
   protected function setHeader($Name, $Value) {
-    return header($Name.': '.$Value);
+	return header($Name.': '.$Value);
   }
 
   /**
@@ -936,8 +936,8 @@ 
    * @return string|false
    */
   protected function getUserAgent() {
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
-    return $_SERVER['HTTP_USER_AGENT'];
+	if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+	return $_SERVER['HTTP_USER_AGENT'];
   }
 
   /**
@@ -947,7 +947,7 @@ 
    * @return Exception
    */
   protected function newException($Message) {
-    return new Exception($Message);
+	return new Exception($Message);
   }
   
   /**
@@ -960,17 +960,17 @@ 
    */
   public function jsonEncode($Object, $skipObjectEncode=false)
   {
-    if(!$skipObjectEncode) {
-      $Object = $this->encodeObject($Object);
-    }
+	if(!$skipObjectEncode) {
+	  $Object = $this->encodeObject($Object);
+	}
     
-    if(function_exists('json_encode')
-       && $this->options['useNativeJsonEncode']!=false) {
+	if(function_exists('json_encode')
+	   && $this->options['useNativeJsonEncode']!=false) {
 
-      return json_encode($Object);
-    } else {
-      return $this->json_encode($Object);
-    }
+	  return json_encode($Object);
+	} else {
+	  return $this->json_encode($Object);
+	}
   }
 
   /**
@@ -981,23 +981,23 @@ 
    */  
   protected function encodeTable($Table) {
     
-    if(!$Table) return $Table;
+	if(!$Table) return $Table;
     
-    $new_table = array();
-    foreach($Table as $row) {
+	$new_table = array();
+	foreach($Table as $row) {
   
-      if(is_array($row)) {
-        $new_row = array();
+	  if(is_array($row)) {
+		$new_row = array();
         
-        foreach($row as $item) {
-          $new_row[] = $this->encodeObject($item);
-        }
+		foreach($row as $item) {
+		  $new_row[] = $this->encodeObject($item);
+		}
         
-        $new_table[] = $new_row;
-      }
-    }
+		$new_table[] = $new_row;
+	  }
+	}
     
-    return $new_table;
+	return $new_table;
   }
 
   /**
@@ -1010,134 +1010,134 @@ 
    */
   protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1)
   {
-    $return = array();
+	$return = array();
 
-    if (is_resource($Object)) {
+	if (is_resource($Object)) {
 
-      return '** '.(string)$Object.' **';
+	  return '** '.(string)$Object.' **';
 
-    } else    
-    if (is_object($Object)) {
+	} else    
+	if (is_object($Object)) {
 
-        if ($ObjectDepth > $this->options['maxObjectDepth']) {
-          return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
-        }
+		if ($ObjectDepth > $this->options['maxObjectDepth']) {
+		  return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
+		}
         
-        foreach ($this->objectStack as $refVal) {
-            if ($refVal === $Object) {
-                return '** Recursion ('.get_class($Object).') **';
-            }
-        }
-        array_push($this->objectStack, $Object);
+		foreach ($this->objectStack as $refVal) {
+			if ($refVal === $Object) {
+				return '** Recursion ('.get_class($Object).') **';
+			}
+		}
+		array_push($this->objectStack, $Object);
                 
-        $return['__className'] = $class = get_class($Object);
+		$return['__className'] = $class = get_class($Object);
 
-        $reflectionClass = new ReflectionClass($class);  
-        $properties = array();
-        foreach( $reflectionClass->getProperties() as $property) {
-          $properties[$property->getName()] = $property;
-        }
+		$reflectionClass = new ReflectionClass($class);  
+		$properties = array();
+		foreach( $reflectionClass->getProperties() as $property) {
+		  $properties[$property->getName()] = $property;
+		}
             
-        $members = (array)$Object;
+		$members = (array)$Object;
             
-        foreach( $properties as $raw_name => $property ) {
+		foreach( $properties as $raw_name => $property ) {
           
-          $name = $raw_name;
-          if($property->isStatic()) {
-            $name = 'static:'.$name;
-          }
-          if($property->isPublic()) {
-            $name = 'public:'.$name;
-          } else
-          if($property->isPrivate()) {
-            $name = 'private:'.$name;
-            $raw_name = "\0".$class."\0".$raw_name;
-          } else
-          if($property->isProtected()) {
-            $name = 'protected:'.$name;
-            $raw_name = "\0".'*'."\0".$raw_name;
-          }
+		  $name = $raw_name;
+		  if($property->isStatic()) {
+			$name = 'static:'.$name;
+		  }
+		  if($property->isPublic()) {
+			$name = 'public:'.$name;
+		  } else
+		  if($property->isPrivate()) {
+			$name = 'private:'.$name;
+			$raw_name = "\0".$class."\0".$raw_name;
+		  } else
+		  if($property->isProtected()) {
+			$name = 'protected:'.$name;
+			$raw_name = "\0".'*'."\0".$raw_name;
+		  }
           
-          if(!(isset($this->objectFilters[$class])
-               && is_array($this->objectFilters[$class])
-               && in_array($raw_name,$this->objectFilters[$class]))) {
+		  if(!(isset($this->objectFilters[$class])
+			   && is_array($this->objectFilters[$class])
+			   && in_array($raw_name,$this->objectFilters[$class]))) {
 
-            if(array_key_exists($raw_name,$members)
-               && !$property->isStatic()) {
+			if(array_key_exists($raw_name,$members)
+			   && !$property->isStatic()) {
               
-              $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);      
+			  $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);      
             
-            } else {
-              if(method_exists($property,'setAccessible')) {
-                $property->setAccessible(true);
-                $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
-              } else
-              if($property->isPublic()) {
-                $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
-              } else {
-                $return[$name] = '** Need PHP 5.3 to get value **';
-              }
-            }
-          } else {
-            $return[$name] = '** Excluded by Filter **';
-          }
-        }
+			} else {
+			  if(method_exists($property,'setAccessible')) {
+				$property->setAccessible(true);
+				$return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
+			  } else
+			  if($property->isPublic()) {
+				$return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
+			  } else {
+				$return[$name] = '** Need PHP 5.3 to get value **';
+			  }
+			}
+		  } else {
+			$return[$name] = '** Excluded by Filter **';
+		  }
+		}
         
-        // Include all members that are not defined in the class
-        // but exist in the object
-        foreach( $members as $raw_name => $value ) {
+		// Include all members that are not defined in the class
+		// but exist in the object
+		foreach( $members as $raw_name => $value ) {
           
-          $name = $raw_name;
+		  $name = $raw_name;
           
-          if ($name{0} == "\0") {
-            $parts = explode("\0", $name);
-            $name = $parts[2];
-          }
+		  if ($name{0} == "\0") {
+			$parts = explode("\0", $name);
+			$name = $parts[2];
+		  }
           
-          if(!isset($properties[$name])) {
-            $name = 'undeclared:'.$name;
+		  if(!isset($properties[$name])) {
+			$name = 'undeclared:'.$name;
               
-            if(!(isset($this->objectFilters[$class])
-                 && is_array($this->objectFilters[$class])
-                 && in_array($raw_name,$this->objectFilters[$class]))) {
+			if(!(isset($this->objectFilters[$class])
+				 && is_array($this->objectFilters[$class])
+				 && in_array($raw_name,$this->objectFilters[$class]))) {
               
-              $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
-            } else {
-              $return[$name] = '** Excluded by Filter **';
-            }
-          }
-        }
+			  $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
+			} else {
+			  $return[$name] = '** Excluded by Filter **';
+			}
+		  }
+		}
         
-        array_pop($this->objectStack);
+		array_pop($this->objectStack);
         
-    } elseif (is_array($Object)) {
+	} elseif (is_array($Object)) {
 
-        if ($ArrayDepth > $this->options['maxArrayDepth']) {
-          return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
-        }
+		if ($ArrayDepth > $this->options['maxArrayDepth']) {
+		  return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
+		}
       
-        foreach ($Object as $key => $val) {
+		foreach ($Object as $key => $val) {
           
-          // Encoding the $GLOBALS PHP array causes an infinite loop
-          // if the recursion is not reset here as it contains
-          // a reference to itself. This is the only way I have come up
-          // with to stop infinite recursion in this case.
-          if($key=='GLOBALS'
-             && is_array($val)
-             && array_key_exists('GLOBALS',$val)) {
-            $val['GLOBALS'] = '** Recursion (GLOBALS) **';
-          }
+		  // Encoding the $GLOBALS PHP array causes an infinite loop
+		  // if the recursion is not reset here as it contains
+		  // a reference to itself. This is the only way I have come up
+		  // with to stop infinite recursion in this case.
+		  if($key=='GLOBALS'
+			 && is_array($val)
+			 && array_key_exists('GLOBALS',$val)) {
+			$val['GLOBALS'] = '** Recursion (GLOBALS) **';
+		  }
           
-          $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
-        }
-    } else {
-      if(self::is_utf8($Object)) {
-        return $Object;
-      } else {
-        return utf8_encode($Object);
-      }
-    }
-    return $return;
+		  $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
+		}
+	} else {
+	  if(self::is_utf8($Object)) {
+		return $Object;
+	  } else {
+		return utf8_encode($Object);
+	  }
+	}
+	return $return;
   }
 
   /**
@@ -1147,29 +1147,29 @@ 
    * @return boolean
    */
   protected static function is_utf8($str) {
-    $c=0; $b=0;
-    $bits=0;
-    $len=strlen($str);
-    for($i=0; $i<$len; $i++){
-        $c=ord($str[$i]);
-        if($c > 128){
-            if(($c >= 254)) return false;
-            elseif($c >= 252) $bits=6;
-            elseif($c >= 248) $bits=5;
-            elseif($c >= 240) $bits=4;
-            elseif($c >= 224) $bits=3;
-            elseif($c >= 192) $bits=2;
-            else return false;
-            if(($i+$bits) > $len) return false;
-            while($bits > 1){
-                $i++;
-                $b=ord($str[$i]);
-                if($b < 128 || $b > 191) return false;
-                $bits--;
-            }
-        }
-    }
-    return true;
+	$c=0; $b=0;
+	$bits=0;
+	$len=strlen($str);
+	for($i=0; $i<$len; $i++){
+		$c=ord($str[$i]);
+		if($c > 128){
+			if(($c >= 254)) return false;
+			elseif($c >= 252) $bits=6;
+			elseif($c >= 248) $bits=5;
+			elseif($c >= 240) $bits=4;
+			elseif($c >= 224) $bits=3;
+			elseif($c >= 192) $bits=2;
+			else return false;
+			if(($i+$bits) > $len) return false;
+			while($bits > 1){
+				$i++;
+				$b=ord($str[$i]);
+				if($b < 128 || $b > 191) return false;
+				$bits--;
+			}
+		}
+	}
+	return true;
   } 
 
   /**
@@ -1248,35 +1248,35 @@ 
   */
   private function json_utf82utf16($utf8)
   {
-      // oh please oh please oh please oh please oh please
-      if(function_exists('mb_convert_encoding')) {
-          return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-      }
-
-      switch(strlen($utf8)) {
-          case 1:
-              // this case should never be reached, because we are in ASCII range
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return $utf8;
-
-          case 2:
-              // return a UTF-16 character from a 2-byte UTF-8 char
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return chr(0x07 & (ord($utf8{0}) >> 2))
-                   . chr((0xC0 & (ord($utf8{0}) << 6))
-                       | (0x3F & ord($utf8{1})));
-
-          case 3:
-              // return a UTF-16 character from a 3-byte UTF-8 char
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return chr((0xF0 & (ord($utf8{0}) << 4))
-                       | (0x0F & (ord($utf8{1}) >> 2)))
-                   . chr((0xC0 & (ord($utf8{1}) << 6))
-                       | (0x7F & ord($utf8{2})));
-      }
-
-      // ignoring UTF-32 for now, sorry
-      return '';
+	  // oh please oh please oh please oh please oh please
+	  if(function_exists('mb_convert_encoding')) {
+		  return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+	  }
+
+	  switch(strlen($utf8)) {
+		  case 1:
+			  // this case should never be reached, because we are in ASCII range
+			  // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+			  return $utf8;
+
+		  case 2:
+			  // return a UTF-16 character from a 2-byte UTF-8 char
+			  // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+			  return chr(0x07 & (ord($utf8{0}) >> 2))
+				   . chr((0xC0 & (ord($utf8{0}) << 6))
+					   | (0x3F & ord($utf8{1})));
+
+		  case 3:
+			  // return a UTF-16 character from a 3-byte UTF-8 char
+			  // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+			  return chr((0xF0 & (ord($utf8{0}) << 4))
+					   | (0x0F & (ord($utf8{1}) >> 2)))
+				   . chr((0xC0 & (ord($utf8{1}) << 6))
+					   | (0x7F & ord($utf8{2})));
+	  }
+
+	  // ignoring UTF-32 for now, sorry
+	  return '';
   }
 
  /**
@@ -1293,133 +1293,133 @@ 
   private function json_encode($var)
   {
     
-    if(is_object($var)) {
-      if(in_array($var,$this->json_objectStack)) {
-        return '"** Recursion **"';
-      }
-    }
+	if(is_object($var)) {
+	  if(in_array($var,$this->json_objectStack)) {
+		return '"** Recursion **"';
+	  }
+	}
           
-      switch (gettype($var)) {
-          case 'boolean':
-              return $var ? 'true' : 'false';
+	  switch (gettype($var)) {
+		  case 'boolean':
+			  return $var ? 'true' : 'false';
 
-          case 'NULL':
-              return 'null';
+		  case 'NULL':
+			  return 'null';
 
-          case 'integer':
-              return (int) $var;
+		  case 'integer':
+			  return (int) $var;
 
-          case 'double':
-          case 'float':
-              return (float) $var;
+		  case 'double':
+		  case 'float':
+			  return (float) $var;
 
-          case 'string':
-              // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-              $ascii = '';
-              $strlen_var = strlen($var);
+		  case 'string':
+			  // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+			  $ascii = '';
+			  $strlen_var = strlen($var);
 
-             /*
+			 /*
               * Iterate over every character in the string,
               * escaping with a slash or encoding to UTF-8 where necessary
               */
-              for ($c = 0; $c < $strlen_var; ++$c) {
-
-                  $ord_var_c = ord($var{$c});
-
-                  switch (true) {
-                      case $ord_var_c == 0x08:
-                          $ascii .= '\b';
-                          break;
-                      case $ord_var_c == 0x09:
-                          $ascii .= '\t';
-                          break;
-                      case $ord_var_c == 0x0A:
-                          $ascii .= '\n';
-                          break;
-                      case $ord_var_c == 0x0C:
-                          $ascii .= '\f';
-                          break;
-                      case $ord_var_c == 0x0D:
-                          $ascii .= '\r';
-                          break;
-
-                      case $ord_var_c == 0x22:
-                      case $ord_var_c == 0x2F:
-                      case $ord_var_c == 0x5C:
-                          // double quote, slash, slosh
-                          $ascii .= '\\'.$var{$c};
-                          break;
-
-                      case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                          // characters U-00000000 - U-0000007F (same as ASCII)
-                          $ascii .= $var{$c};
-                          break;
-
-                      case (($ord_var_c & 0xE0) == 0xC0):
-                          // characters U-00000080 - U-000007FF, mask 110XXXXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                          $c += 1;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xF0) == 0xE0):
-                          // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}));
-                          $c += 2;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xF8) == 0xF0):
-                          // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}));
-                          $c += 3;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xFC) == 0xF8):
-                          // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}),
-                                       ord($var{$c + 4}));
-                          $c += 4;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xFE) == 0xFC):
-                          // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}),
-                                       ord($var{$c + 4}),
-                                       ord($var{$c + 5}));
-                          $c += 5;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-                  }
-              }
-
-              return '"'.$ascii.'"';
-
-          case 'array':
-             /*
+			  for ($c = 0; $c < $strlen_var; ++$c) {
+
+				  $ord_var_c = ord($var{$c});
+
+				  switch (true) {
+					  case $ord_var_c == 0x08:
+						  $ascii .= '\b';
+						  break;
+					  case $ord_var_c == 0x09:
+						  $ascii .= '\t';
+						  break;
+					  case $ord_var_c == 0x0A:
+						  $ascii .= '\n';
+						  break;
+					  case $ord_var_c == 0x0C:
+						  $ascii .= '\f';
+						  break;
+					  case $ord_var_c == 0x0D:
+						  $ascii .= '\r';
+						  break;
+
+					  case $ord_var_c == 0x22:
+					  case $ord_var_c == 0x2F:
+					  case $ord_var_c == 0x5C:
+						  // double quote, slash, slosh
+						  $ascii .= '\\'.$var{$c};
+						  break;
+
+					  case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+						  // characters U-00000000 - U-0000007F (same as ASCII)
+						  $ascii .= $var{$c};
+						  break;
+
+					  case (($ord_var_c & 0xE0) == 0xC0):
+						  // characters U-00000080 - U-000007FF, mask 110XXXXX
+						  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+						  $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+						  $c += 1;
+						  $utf16 = $this->json_utf82utf16($char);
+						  $ascii .= sprintf('\u%04s', bin2hex($utf16));
+						  break;
+
+					  case (($ord_var_c & 0xF0) == 0xE0):
+						  // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+						  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+						  $char = pack('C*', $ord_var_c,
+									   ord($var{$c + 1}),
+									   ord($var{$c + 2}));
+						  $c += 2;
+						  $utf16 = $this->json_utf82utf16($char);
+						  $ascii .= sprintf('\u%04s', bin2hex($utf16));
+						  break;
+
+					  case (($ord_var_c & 0xF8) == 0xF0):
+						  // characters U-00010000 - U-001FFFFF, mask 11110XXX
+						  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+						  $char = pack('C*', $ord_var_c,
+									   ord($var{$c + 1}),
+									   ord($var{$c + 2}),
+									   ord($var{$c + 3}));
+						  $c += 3;
+						  $utf16 = $this->json_utf82utf16($char);
+						  $ascii .= sprintf('\u%04s', bin2hex($utf16));
+						  break;
+
+					  case (($ord_var_c & 0xFC) == 0xF8):
+						  // characters U-00200000 - U-03FFFFFF, mask 111110XX
+						  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+						  $char = pack('C*', $ord_var_c,
+									   ord($var{$c + 1}),
+									   ord($var{$c + 2}),
+									   ord($var{$c + 3}),
+									   ord($var{$c + 4}));
+						  $c += 4;
+						  $utf16 = $this->json_utf82utf16($char);
+						  $ascii .= sprintf('\u%04s', bin2hex($utf16));
+						  break;
+
+					  case (($ord_var_c & 0xFE) == 0xFC):
+						  // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+						  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+						  $char = pack('C*', $ord_var_c,
+									   ord($var{$c + 1}),
+									   ord($var{$c + 2}),
+									   ord($var{$c + 3}),
+									   ord($var{$c + 4}),
+									   ord($var{$c + 5}));
+						  $c += 5;
+						  $utf16 = $this->json_utf82utf16($char);
+						  $ascii .= sprintf('\u%04s', bin2hex($utf16));
+						  break;
+				  }
+			  }
+
+			  return '"'.$ascii.'"';
+
+		  case 'array':
+			 /*
               * As per JSON spec if any array key is not an integer
               * we must treat the the whole array as an object. We
               * also try to catch a sparsely populated associative
@@ -1437,63 +1437,63 @@ 
               * bracket notation.
               */
 
-              // treat as a JSON object
-              if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+			  // treat as a JSON object
+			  if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
                   
-                  $this->json_objectStack[] = $var;
+				  $this->json_objectStack[] = $var;
 
-                  $properties = array_map(array($this, 'json_name_value'),
-                                          array_keys($var),
-                                          array_values($var));
+				  $properties = array_map(array($this, 'json_name_value'),
+										  array_keys($var),
+										  array_values($var));
 
-                  array_pop($this->json_objectStack);
+				  array_pop($this->json_objectStack);
 
-                  foreach($properties as $property) {
-                      if($property instanceof Exception) {
-                          return $property;
-                      }
-                  }
+				  foreach($properties as $property) {
+					  if($property instanceof Exception) {
+						  return $property;
+					  }
+				  }
 
-                  return '{' . join(',', $properties) . '}';
-              }
+				  return '{' . join(',', $properties) . '}';
+			  }
 
-              $this->json_objectStack[] = $var;
+			  $this->json_objectStack[] = $var;
 
-              // treat it like a regular array
-              $elements = array_map(array($this, 'json_encode'), $var);
+			  // treat it like a regular array
+			  $elements = array_map(array($this, 'json_encode'), $var);
 
-              array_pop($this->json_objectStack);
+			  array_pop($this->json_objectStack);
 
-              foreach($elements as $element) {
-                  if($element instanceof Exception) {
-                      return $element;
-                  }
-              }
+			  foreach($elements as $element) {
+				  if($element instanceof Exception) {
+					  return $element;
+				  }
+			  }
 
-              return '[' . join(',', $elements) . ']';
+			  return '[' . join(',', $elements) . ']';
 
-          case 'object':
-              $vars = self::encodeObject($var);
+		  case 'object':
+			  $vars = self::encodeObject($var);
 
-              $this->json_objectStack[] = $var;
+			  $this->json_objectStack[] = $var;
 
-              $properties = array_map(array($this, 'json_name_value'),
-                                      array_keys($vars),
-                                      array_values($vars));
+			  $properties = array_map(array($this, 'json_name_value'),
+									  array_keys($vars),
+									  array_values($vars));
 
-              array_pop($this->json_objectStack);
+			  array_pop($this->json_objectStack);
               
-              foreach($properties as $property) {
-                  if($property instanceof Exception) {
-                      return $property;
-                  }
-              }
+			  foreach($properties as $property) {
+				  if($property instanceof Exception) {
+					  return $property;
+				  }
+			  }
                      
-              return '{' . join(',', $properties) . '}';
+			  return '{' . join(',', $properties) . '}';
 
-          default:
-              return null;
-      }
+		  default:
+			  return null;
+	  }
   }
 
  /**
@@ -1507,22 +1507,22 @@ 
   */
   private function json_name_value($name, $value)
   {
-      // Encoding the $GLOBALS PHP array causes an infinite loop
-      // if the recursion is not reset here as it contains
-      // a reference to itself. This is the only way I have come up
-      // with to stop infinite recursion in this case.
-      if($name=='GLOBALS'
-         && is_array($value)
-         && array_key_exists('GLOBALS',$value)) {
-        $value['GLOBALS'] = '** Recursion **';
-      }
+	  // Encoding the $GLOBALS PHP array causes an infinite loop
+	  // if the recursion is not reset here as it contains
+	  // a reference to itself. This is the only way I have come up
+	  // with to stop infinite recursion in this case.
+	  if($name=='GLOBALS'
+		 && is_array($value)
+		 && array_key_exists('GLOBALS',$value)) {
+		$value['GLOBALS'] = '** Recursion **';
+	  }
     
-      $encoded_value = $this->json_encode($value);
+	  $encoded_value = $this->json_encode($value);
 
-      if($encoded_value instanceof Exception) {
-          return $encoded_value;
-      }
+	  if($encoded_value instanceof Exception) {
+		  return $encoded_value;
+	  }
 
-      return $this->json_encode(strval($name)) . ':' . $encoded_value;
+	  return $this->json_encode(strval($name)) . ':' . $encoded_value;
   }
 }

framework/3rdParty/PhpShell/PHP/Shell/Extensions.php

Doc Comments +4 added lines

@@ -13,6 +13,10 @@
 *  
 */
 interface PHP_Shell_Extension {
+
+    /**
+     * @return void
+     */
     public function register();
 }
 

Indentation +54 added lines, -54 removed lines

@@ -13,7 +13,7 @@ 
 *  
 */
 interface PHP_Shell_Extension {
-    public function register();
+	public function register();
 }
 
 /**
@@ -22,65 +22,65 @@ 
 * 
 */
 class PHP_Shell_Extensions {
-    /**
-    * @var PHP_Shell_Extensions
-    */
-    static protected $instance;
+	/**
+	 * @var PHP_Shell_Extensions
+	 */
+	static protected $instance;
 
-    /**
-    * storage for the extension
-    *
-    * @var array
-    */
-    protected $exts = array();
+	/**
+	 * storage for the extension
+	 *
+	 * @var array
+	 */
+	protected $exts = array();
 
-    /**
-    * the extension object gives access to the register objects
-    * through the a simple $exts->name->...
-    *
-    * @param string registered name of the extension 
-    * @return PHP_Shell_Extension object handle
-    */
-    public function __get($key) {
-        if (!isset($this->exts[$key])) {
-            throw new Exception("Extension $s is not known.");
-        }
-        return $this->exts[$key];
-    }
+	/**
+	 * the extension object gives access to the register objects
+	 * through the a simple $exts->name->...
+	 *
+	 * @param string registered name of the extension 
+	 * @return PHP_Shell_Extension object handle
+	 */
+	public function __get($key) {
+		if (!isset($this->exts[$key])) {
+			throw new Exception("Extension $s is not known.");
+		}
+		return $this->exts[$key];
+	}
 
-    /**
-    * register set of extensions
-    *
-    * @param array set of (name, class-name) pairs
-    */
-    public function registerExtensions($exts) {
-        foreach ($exts as $k => $v) {
-            $this->registerExtension($k, $v);
-        }
-    }
+	/**
+	 * register set of extensions
+	 *
+	 * @param array set of (name, class-name) pairs
+	 */
+	public function registerExtensions($exts) {
+		foreach ($exts as $k => $v) {
+			$this->registerExtension($k, $v);
+		}
+	}
 
-    /**
-    * register a single extension
-    *
-    * @param string name of the registered extension
-    * @param PHP_Shell_Extension the extension object
-    */
-    public function registerExtension($k, PHP_Shell_Extension $obj) {
-        $obj->register();
+	/**
+	 * register a single extension
+	 *
+	 * @param string name of the registered extension
+	 * @param PHP_Shell_Extension the extension object
+	 */
+	public function registerExtension($k, PHP_Shell_Extension $obj) {
+		$obj->register();
 
-        $this->exts[$k] = $obj;
-    }
+		$this->exts[$k] = $obj;
+	}
 
-    /**
-    * @return object a singleton of the class 
-    */
-    static function getInstance() {
-        if (is_null(self::$instance)) {
-            $class = __CLASS__;
-            self::$instance = new $class();
-        }
-        return self::$instance;
-    }
+	/**
+	 * @return object a singleton of the class 
+	 */
+	static function getInstance() {
+		if (is_null(self::$instance)) {
+			$class = __CLASS__;
+			self::$instance = new $class();
+		}
+		return self::$instance;
+	}
 }
 
 

framework/3rdParty/PhpShell/PHP/Shell/Options.php

Doc Comments +2 added lines

@@ -97,6 +97,8 @@
     * calls the setor for the :set <option>
     *
     *
+    * @param string $key
+    * @param string|null $value
     */
     private function execute($key, $value) {
         /* did we hit a alias (bg for backgroud) ? */

Indentation +115 added lines, -115 removed lines

@@ -6,127 +6,127 @@
 *
 */
 class PHP_Shell_Options implements PHP_Shell_Extension {
-    /*
+	/*
     * instance of the current class
     *
     * @var PHP_Shell_Options
     */
-    static protected $instance;
-
-    /**
-    * known options and their setors
-    *
-    * @var array
-    * @see registerOption
-    */
-    protected $options = array();
-
-    /**
-    * known options and their setors
-    *
-    * @var array
-    * @see registerOptionAlias
-    */
-    protected $option_aliases = array();
-
-    public function register() {
+	static protected $instance;
+
+	/**
+	 * known options and their setors
+	 *
+	 * @var array
+	 * @see registerOption
+	 */
+	protected $options = array();
+
+	/**
+	 * known options and their setors
+	 *
+	 * @var array
+	 * @see registerOptionAlias
+	 */
+	protected $option_aliases = array();
+
+	public function register() {
 //        $cmd = PHP_Shell_Commands::getInstance();
  //       $cmd->registerCommand('#^:set #', $this, 'cmdSet', ':set <var>', 'set a shell variable');
-    }
-
-    /**
-    * register a option
-    *
-    * @param string name of the option
-    * @param object a object handle
-    * @param string method-name of the setor in the object
-    * @param string (unused)
-    */
-    public function registerOption($option, $obj, $setor, $getor = null) {
-        if (!method_exists($obj, $setor)) {
-            throw new Exception(sprintf("setor %s doesn't exist on class %s", $setor, get_class($obj)));
-        }
-
-        $this->options[trim($option)] = array("obj" => $obj, "setor" => $setor);
-    }
-
-    /**
-    * set a shell-var
-    *
-    * :set al to enable autoload
-    * :set bg=dark to enable highlighting with a dark backgroud
-    */
-    public function cmdSet($l) {
-        if (!preg_match('#:set\s+([a-z]+)\s*(?:=\s*([a-z0-9]+)\s*)?$#i', $l, $a)) {
-            print(':set failed: either :set <option> or :set <option> = <value>');
-            return;
-        }
-
-        $this->execute($a[1], isset($a[2]) ? $a[2] : null);
-    }
-
-    /**
-    * get all the option names
-    *
-    * @return array names of all options
-    */
-    public function getOptions() {
-        return array_keys($this->options);
-    }
-
-    /**
-    * map a option to another option
-    *
-    * e.g.: bg maps to background
-    *
-    * @param string alias
-    * @param string option
-    */
-    public function registerOptionAlias($alias, $option) {
-        if (!isset($this->options[$option])) {
-            throw new Exception(sprintf("Option %s is not known", $option));
-        }
-
-        $this->option_aliases[trim($alias)] = trim($option);
-
-    }
-
-    /**
-    * execute a :set command
-    *
-    * calls the setor for the :set <option>
-    *
-    *
-    */
-    private function execute($key, $value) {
-        /* did we hit a alias (bg for backgroud) ? */
-        if (isset($this->option_aliases[$key])) {
-            $opt_key = $this->option_aliases[$key];
-        } else {
-            $opt_key = $key;
-        }
-
-        if (!isset($this->options[$opt_key])) {
-            print (':set '.$key.' failed: unknown key');
-            return;
-        }
-
-        if (!isset($this->options[$opt_key]["setor"])) {
-            return;
-        }
-
-        $setor = $this->options[$opt_key]["setor"];
-        $obj = $this->options[$opt_key]["obj"];
-        $obj->$setor($key, $value);
-    }
-
-    static function getInstance() {
-        if (is_null(self::$instance)) {
-            $class = __CLASS__;
-            self::$instance = new $class();
-        }
-        return self::$instance;
-    }
+	}
+
+	/**
+	 * register a option
+	 *
+	 * @param string name of the option
+	 * @param object a object handle
+	 * @param string method-name of the setor in the object
+	 * @param string (unused)
+	 */
+	public function registerOption($option, $obj, $setor, $getor = null) {
+		if (!method_exists($obj, $setor)) {
+			throw new Exception(sprintf("setor %s doesn't exist on class %s", $setor, get_class($obj)));
+		}
+
+		$this->options[trim($option)] = array("obj" => $obj, "setor" => $setor);
+	}
+
+	/**
+	 * set a shell-var
+	 *
+	 * :set al to enable autoload
+	 * :set bg=dark to enable highlighting with a dark backgroud
+	 */
+	public function cmdSet($l) {
+		if (!preg_match('#:set\s+([a-z]+)\s*(?:=\s*([a-z0-9]+)\s*)?$#i', $l, $a)) {
+			print(':set failed: either :set <option> or :set <option> = <value>');
+			return;
+		}
+
+		$this->execute($a[1], isset($a[2]) ? $a[2] : null);
+	}
+
+	/**
+	 * get all the option names
+	 *
+	 * @return array names of all options
+	 */
+	public function getOptions() {
+		return array_keys($this->options);
+	}
+
+	/**
+	 * map a option to another option
+	 *
+	 * e.g.: bg maps to background
+	 *
+	 * @param string alias
+	 * @param string option
+	 */
+	public function registerOptionAlias($alias, $option) {
+		if (!isset($this->options[$option])) {
+			throw new Exception(sprintf("Option %s is not known", $option));
+		}
+
+		$this->option_aliases[trim($alias)] = trim($option);
+
+	}
+
+	/**
+	 * execute a :set command
+	 *
+	 * calls the setor for the :set <option>
+	 *
+	 *
+	 */
+	private function execute($key, $value) {
+		/* did we hit a alias (bg for backgroud) ? */
+		if (isset($this->option_aliases[$key])) {
+			$opt_key = $this->option_aliases[$key];
+		} else {
+			$opt_key = $key;
+		}
+
+		if (!isset($this->options[$opt_key])) {
+			print (':set '.$key.' failed: unknown key');
+			return;
+		}
+
+		if (!isset($this->options[$opt_key]["setor"])) {
+			return;
+		}
+
+		$setor = $this->options[$opt_key]["setor"];
+		$obj = $this->options[$opt_key]["obj"];
+		$obj->$setor($key, $value);
+	}
+
+	static function getInstance() {
+		if (is_null(self::$instance)) {
+			$class = __CLASS__;
+			self::$instance = new $class();
+		}
+		return self::$instance;
+	}
 }
 
 

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once(dirname(__FILE__)."/Extensions.php"); /* for the PHP_Shell_Interface */
+require_once(dirname(__FILE__) . "/Extensions.php"); /* for the PHP_Shell_Interface */
 
 /**
 *
@@ -107,7 +107,7 @@ 
         }
 
         if (!isset($this->options[$opt_key])) {
-            print (':set '.$key.' failed: unknown key');
+            print (':set ' . $key . ' failed: unknown key');
             return;
         }
 

framework/3rdParty/ReCaptcha/recaptchalib.php

Doc Comments +6 added lines

@@ -211,6 +211,9 @@ 
 
 /* Mailhide related code */
 
+/**
+ * @param string $ky
+ */
 function _recaptcha_aes_encrypt($val,$ky) {
 	if (! function_exists ("mcrypt_encrypt")) {
 		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
@@ -222,6 +225,9 @@ 
 }
 
 
+/**
+ * @param null|string $x
+ */
 function _recaptcha_mailhide_urlbase64 ($x) {
 	return strtr(base64_encode ($x), '+/', '-_');
 }

Indentation +72 added lines, -73 removed lines

@@ -45,13 +45,13 @@ 
  * @return string - encoded request
  */
 function _recaptcha_qsencode ($data) {
-        $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+		$req = "";
+		foreach ( $data as $key => $value )
+				$req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
 
-        // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
-        return $req;
+		// Cut the last '&'
+		$req=substr($req,0,strlen($req)-1);
+		return $req;
 }
 
 
@@ -66,29 +66,29 @@ 
  */
 function _recaptcha_http_post($host, $path, $data, $port = 80) {
 
-        $req = _recaptcha_qsencode ($data);
+		$req = _recaptcha_qsencode ($data);
 
-        $http_request  = "POST $path HTTP/1.0\r\n";
-        $http_request .= "Host: $host\r\n";
-        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
-        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
-        $http_request .= "\r\n";
-        $http_request .= $req;
+		$http_request  = "POST $path HTTP/1.0\r\n";
+		$http_request .= "Host: $host\r\n";
+		$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
+		$http_request .= "Content-Length: " . strlen($req) . "\r\n";
+		$http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
+		$http_request .= "\r\n";
+		$http_request .= $req;
 
-        $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
-                die ('Could not open socket');
-        }
+		$response = '';
+		if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+				die ('Could not open socket');
+		}
 
-        fwrite($fs, $http_request);
+		fwrite($fs, $http_request);
 
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
-        fclose($fs);
-        $response = explode("\r\n\r\n", $response, 2);
+		while ( !feof($fs) )
+				$response .= fgets($fs, 1160); // One TCP-IP packet
+		fclose($fs);
+		$response = explode("\r\n\r\n", $response, 2);
 
-        return $response;
+		return $response;
 }
 
 
@@ -100,7 +100,6 @@ 
  * @param string $pubkey A public key for reCAPTCHA
  * @param string $error The error given by reCAPTCHA (optional, default is null)
  * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-
  * @return string - The HTML to be embedded in the user's form.
  */
 function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
@@ -110,16 +109,16 @@ 
 	}
 	
 	if ($use_ssl) {
-                $server = RECAPTCHA_API_SECURE_SERVER;
-        } else {
-                $server = RECAPTCHA_API_SERVER;
-        }
+				$server = RECAPTCHA_API_SECURE_SERVER;
+		} else {
+				$server = RECAPTCHA_API_SERVER;
+		}
 
-        $errorpart = "";
-        if ($error) {
-           $errorpart = "&error=" . $error;
-        }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+		$errorpart = "";
+		if ($error) {
+		   $errorpart = "&amp;error=" . $error;
+		}
+		return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 
 	<noscript>
   		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
@@ -135,20 +134,20 @@ 
  * A ReCaptchaResponse is returned from recaptcha_check_answer()
  */
 class ReCaptchaResponse {
-        var $is_valid;
-        var $error;
+		var $is_valid;
+		var $error;
 }
 
 
 /**
-  * Calls an HTTP POST function to verify if the user's guess was correct
-  * @param string $privkey
-  * @param string $remoteip
-  * @param string $challenge
-  * @param string $response
-  * @param array $extra_params an array of extra variables to post to the server
-  * @return ReCaptchaResponse
-  */
+ * Calls an HTTP POST function to verify if the user's guess was correct
+ * @param string $privkey
+ * @param string $remoteip
+ * @param string $challenge
+ * @param string $response
+ * @param array $extra_params an array of extra variables to post to the server
+ * @return ReCaptchaResponse
+ */
 function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
 {
 	if ($privkey == null || $privkey == '') {
@@ -161,34 +160,34 @@ 
 
 	
 	
-        //discard spam submissions
-        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
-                $recaptcha_response = new ReCaptchaResponse();
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = 'incorrect-captcha-sol';
-                return $recaptcha_response;
-        }
-
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-                                          array (
-                                                 'privatekey' => $privkey,
-                                                 'remoteip' => $remoteip,
-                                                 'challenge' => $challenge,
-                                                 'response' => $response
-                                                 ) + $extra_params
-                                          );
-
-        $answers = explode ("\n", $response [1]);
-        $recaptcha_response = new ReCaptchaResponse();
-
-        if (trim ($answers [0]) == 'true') {
-                $recaptcha_response->is_valid = true;
-        }
-        else {
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = $answers [1];
-        }
-        return $recaptcha_response;
+		//discard spam submissions
+		if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+				$recaptcha_response = new ReCaptchaResponse();
+				$recaptcha_response->is_valid = false;
+				$recaptcha_response->error = 'incorrect-captcha-sol';
+				return $recaptcha_response;
+		}
+
+		$response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
+										  array (
+												 'privatekey' => $privkey,
+												 'remoteip' => $remoteip,
+												 'challenge' => $challenge,
+												 'response' => $response
+												 ) + $extra_params
+										  );
+
+		$answers = explode ("\n", $response [1]);
+		$recaptcha_response = new ReCaptchaResponse();
+
+		if (trim ($answers [0]) == 'true') {
+				$recaptcha_response->is_valid = true;
+		}
+		else {
+				$recaptcha_response->is_valid = false;
+				$recaptcha_response->error = $answers [1];
+		}
+		return $recaptcha_response;
 
 }
 
@@ -230,7 +229,7 @@ 
 function recaptcha_mailhide_url($pubkey, $privkey, $email) {
 	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
 		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
+			 "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
 	}
 	
 

Spacing +38 added lines, -38 removed lines

@@ -44,13 +44,13 @@ 
  * @param $data - array of string elements to be encoded
  * @return string - encoded request
  */
-function _recaptcha_qsencode ($data) {
+function _recaptcha_qsencode($data) {
         $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        foreach ($data as $key => $value)
+                $req .= $key . '=' . urlencode(stripslashes($value)) . '&';
 
         // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
+        $req = substr($req, 0, strlen($req) - 1);
         return $req;
 }
 
@@ -66,7 +66,7 @@ 
  */
 function _recaptcha_http_post($host, $path, $data, $port = 80) {
 
-        $req = _recaptcha_qsencode ($data);
+        $req = _recaptcha_qsencode($data);
 
         $http_request  = "POST $path HTTP/1.0\r\n";
         $http_request .= "Host: $host\r\n";
@@ -77,13 +77,13 @@ 
         $http_request .= $req;
 
         $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+        if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
                 die ('Could not open socket');
         }
 
         fwrite($fs, $http_request);
 
-        while ( !feof($fs) )
+        while (!feof($fs))
                 $response .= fgets($fs, 1160); // One TCP-IP packet
         fclose($fs);
         $response = explode("\r\n\r\n", $response, 2);
@@ -103,7 +103,7 @@ 
 
  * @return string - The HTML to be embedded in the user's form.
  */
-function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
+function recaptcha_get_html($pubkey, $error = null, $use_ssl = false)
 {
 	if ($pubkey == null || $pubkey == '') {
 		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
@@ -119,7 +119,7 @@ 
         if ($error) {
            $errorpart = "&amp;error=" . $error;
         }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+        return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 
 	<noscript>
   		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
@@ -149,7 +149,7 @@ 
   * @param array $extra_params an array of extra variables to post to the server
   * @return ReCaptchaResponse
   */
-function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
+function recaptcha_check_answer($privkey, $remoteip, $challenge, $response, $extra_params = array())
 {
 	if ($privkey == null || $privkey == '') {
 		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
@@ -169,8 +169,8 @@ 
                 return $recaptcha_response;
         }
 
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-                                          array (
+        $response = _recaptcha_http_post(RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
+                                          array(
                                                  'privatekey' => $privkey,
                                                  'remoteip' => $remoteip,
                                                  'challenge' => $challenge,
@@ -178,10 +178,10 @@ 
                                                  ) + $extra_params
                                           );
 
-        $answers = explode ("\n", $response [1]);
+        $answers = explode("\n", $response [1]);
         $recaptcha_response = new ReCaptchaResponse();
 
-        if (trim ($answers [0]) == 'true') {
+        if (trim($answers [0]) == 'true') {
                 $recaptcha_response->is_valid = true;
         }
         else {
@@ -199,31 +199,31 @@ 
  * @param string $domain The domain where the page is hosted
  * @param string $appname The name of your application
  */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+function recaptcha_get_signup_url($domain = null, $appname = null) {
+	return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode(array('domains' => $domain, 'app' => $appname));
 }
 
 function _recaptcha_aes_pad($val) {
 	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+	$numpad = $block_size - (strlen($val) % $block_size);
+	return str_pad($val, strlen($val) + $numpad, chr($numpad));
 }
 
 /* Mailhide related code */
 
-function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
+function _recaptcha_aes_encrypt($val, $ky) {
+	if (!function_exists("mcrypt_encrypt")) {
 		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
 	}
-	$mode=MCRYPT_MODE_CBC;   
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
+	$mode = MCRYPT_MODE_CBC;   
+	$enc = MCRYPT_RIJNDAEL_128;
+	$val = _recaptcha_aes_pad($val);
 	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 }
 
 
-function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
+function _recaptcha_mailhide_urlbase64($x) {
+	return strtr(base64_encode($x), '+/', '-_');
 }
 
 /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
@@ -235,9 +235,9 @@ 
 	
 
 	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+	$cryptmail = _recaptcha_aes_encrypt($email, $ky);
 	
-	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64($cryptmail);
 }
 
 /**
@@ -245,15 +245,15 @@ 
  * eg, given johndoe@example,com return ["john", "example.com"].
  * the email is then displayed as john...@example.com
  */
-function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
+function _recaptcha_mailhide_email_parts($email) {
+	$arr = preg_split("/@/", $email);
 
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
+	if (strlen($arr[0]) <= 4) {
+		$arr[0] = substr($arr[0], 0, 1);
+	} else if (strlen($arr[0]) <= 6) {
+		$arr[0] = substr($arr[0], 0, 3);
 	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
+		$arr[0] = substr($arr[0], 0, 4);
 	}
 	return $arr;
 }
@@ -265,11 +265,11 @@ 
  * http://www.google.com/recaptcha/mailhide/apikey
  */
 function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+	$emailparts = _recaptcha_mailhide_email_parts($email);
+	$url = recaptcha_mailhide_url($pubkey, $privkey, $email);
 	
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+	return htmlentities($emailparts[0]) . "<a href='" . htmlentities($url) .
+		"' onclick=\"window.open('" . htmlentities($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities($emailparts [1]);
 
 }
 

Braces +8 added lines, -6 removed lines

@@ -46,8 +46,9 @@ 
  */
 function _recaptcha_qsencode ($data) {
         $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        foreach ( $data as $key => $value ) {
+                        $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        }
 
         // Cut the last '&'
         $req=substr($req,0,strlen($req)-1);
@@ -83,8 +84,10 @@ 
 
         fwrite($fs, $http_request);
 
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
+        while ( !feof($fs) ) {
+                        $response .= fgets($fs, 1160);
+        }
+        // One TCP-IP packet
         fclose($fs);
         $response = explode("\r\n\r\n", $response, 2);
 
@@ -183,8 +186,7 @@ 
 
         if (trim ($answers [0]) == 'true') {
                 $recaptcha_response->is_valid = true;
-        }
-        else {
+        } else {
                 $recaptcha_response->is_valid = false;
                 $recaptcha_response->error = $answers [1];
         }

framework/3rdParty/SafeHtml/HTMLSax3.php

Doc Comments +12 added lines, -3 removed lines

@@ -196,7 +196,7 @@ 
     /**
     * Returns the next character from the XML document or void if at end
     * @access protected
-    * @return mixed
+    * @return string|null
     */
     function scanCharacter() {
         if ($this->position < $this->length) {
@@ -332,6 +332,7 @@ 
     * parser options
     * @var TSax3 instance of user front end class
     * @access protected
+    * @param TSax3 $htmlsax
     */
     function __construct(& $htmlsax) {
         parent::__construct($htmlsax);
@@ -397,6 +398,7 @@ 
     * parser options
     * @var TSax3 instance of user front end class
     * @access protected
+    * @param TSax3 $htmlsax
     */
     function __construct(& $htmlsax) {
         parent::__construct($htmlsax);
@@ -508,7 +510,7 @@ 
     * if supplied argument is not an object.
     * @param object handler object containing SAX callback methods
     * @access public
-    * @return mixed
+    * @return boolean|null
     */
     function set_object(&$object) {
         if ( is_object($object) ) {
@@ -546,7 +548,7 @@ 
     * @param string name of parser option
     * @param int (optional) 1 to switch on, 0 for off
     * @access public
-    * @return boolean
+    * @return boolean|null
     */
     function set_option($name, $value=1) {
         if ( array_key_exists($name,$this->state_parser->parser_options) ) {
@@ -568,6 +570,7 @@ 
     * function myDataHander(& $parser,$data){}
     * </pre>
     * @param string name of method
+    * @param string $data_method
     * @access public
     * @return void
     * @see set_object
@@ -591,6 +594,8 @@ 
     * </pre>
     * @param string name of open method
     * @param string name of close method
+    * @param string $opening_method
+    * @param string $closing_method
     * @access public
     * @return void
     * @see set_object
@@ -610,6 +615,7 @@ 
     * function myPIHander(& $parser,$target, $data){}
     * </pre>
     * @param string name of method
+    * @param string $pi_method
     * @access public
     * @return void
     * @see set_object
@@ -628,6 +634,7 @@ 
     * function myEscapeHander(& $parser, $data){}
     * </pre>
     * @param string name of method
+    * @param string $escape_method
     * @access public
     * @return void
     * @see set_object
@@ -645,6 +652,7 @@ 
     * function myJaspHander(& $parser, $data){}
     * </pre>
     * @param string name of method
+    * @param string $jasp_method
     * @access public
     * @return void
     * @see set_object
@@ -684,6 +692,7 @@ 
     /**
     * Start parsing some XML
     * @param string XML document
+    * @param string $data
     * @access public
     * @return void
     */

Indentation +604 added lines, -604 removed lines

@@ -39,114 +39,114 @@ 
 * @abstract
 */
 class TSax3_StateParser {
-    /**
-    * Instance of user front end class to be passed to callbacks
-    * @var TSax3
-    * @access private
-    */
-    public $htmlsax;
-    /**
-    * User defined object for handling elements
-    * @var object
-    * @access private
-    */
-    public $handler_object_element;
-    /**
-    * User defined open tag handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_opening;
-    /**
-    * User defined close tag handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_closing;
-    /**
-    * User defined object for handling data in elements
-    * @var object
-    * @access private
-    */
-    public $handler_object_data;
-    /**
-    * User defined data handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_data;
-    /**
-    * User defined object for handling processing instructions
-    * @var object
-    * @access private
-    */
-    public $handler_object_pi;
-    /**
-    * User defined processing instruction handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_pi;
-    /**
-    * User defined object for handling JSP/ASP tags
-    * @var object
-    * @access private
-    */
-    public $handler_object_jasp;
-    /**
-    * User defined JSP/ASP handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_jasp;
-    /**
-    * User defined object for handling XML escapes
-    * @var object
-    * @access private
-    */
-    public $handler_object_escape;
-    /**
-    * User defined XML escape handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_escape;
-    /**
-    * User defined handler object or NullHandler
-    * @var object
-    * @access private
-    */
-    public $handler_default;
-    /**
-    * Parser options determining parsing behavior
-    * @var array
-    * @access private
-    */
-    protected $parser_options = array();
-    /**
-    * XML document being parsed
-    * @var string
-    * @access private
-    */
-    protected $rawtext;
-    /**
-    * Position in XML document relative to start (0)
-    * @var int
-    * @access private
-    */
-    protected $position;
-    /**
-    * Length of the XML document in characters
-    * @var int
-    * @access private
-    */
-    protected $length;
-    /**
-    * Array of state objects
-    * @var array
-    * @access private
-    */
-    protected $State = array();
+	/**
+	 * Instance of user front end class to be passed to callbacks
+	 * @var TSax3
+	 * @access private
+	 */
+	public $htmlsax;
+	/**
+	 * User defined object for handling elements
+	 * @var object
+	 * @access private
+	 */
+	public $handler_object_element;
+	/**
+	 * User defined open tag handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_opening;
+	/**
+	 * User defined close tag handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_closing;
+	/**
+	 * User defined object for handling data in elements
+	 * @var object
+	 * @access private
+	 */
+	public $handler_object_data;
+	/**
+	 * User defined data handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_data;
+	/**
+	 * User defined object for handling processing instructions
+	 * @var object
+	 * @access private
+	 */
+	public $handler_object_pi;
+	/**
+	 * User defined processing instruction handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_pi;
+	/**
+	 * User defined object for handling JSP/ASP tags
+	 * @var object
+	 * @access private
+	 */
+	public $handler_object_jasp;
+	/**
+	 * User defined JSP/ASP handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_jasp;
+	/**
+	 * User defined object for handling XML escapes
+	 * @var object
+	 * @access private
+	 */
+	public $handler_object_escape;
+	/**
+	 * User defined XML escape handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_escape;
+	/**
+	 * User defined handler object or NullHandler
+	 * @var object
+	 * @access private
+	 */
+	public $handler_default;
+	/**
+	 * Parser options determining parsing behavior
+	 * @var array
+	 * @access private
+	 */
+	protected $parser_options = array();
+	/**
+	 * XML document being parsed
+	 * @var string
+	 * @access private
+	 */
+	protected $rawtext;
+	/**
+	 * Position in XML document relative to start (0)
+	 * @var int
+	 * @access private
+	 */
+	protected $position;
+	/**
+	 * Length of the XML document in characters
+	 * @var int
+	 * @access private
+	 */
+	protected $length;
+	/**
+	 * Array of state objects
+	 * @var array
+	 * @access private
+	 */
+	protected $State = array();
 
 	const TSAX3_STATE_STOP = 0;
 	const TSAX3_STATE_START = 1;
@@ -157,166 +157,166 @@ 
 	const TSAX3_STATE_JASP = 7;
 	const TSAX3_STATE_PI = 8;
 
-    /**
-    * Constructs TSax3_StateParser setting up states
-    * @var TSax3 instance of user front end class
-    * @access protected
-    */
-    protected function __construct($htmlsax) {
-        $this->htmlsax = $htmlsax;
-        $this->State[self::TSAX3_STATE_START] = new TSax3_StartingState();
-
-        $this->State[self::TSAX3_STATE_CLOSING_TAG] = new TSax3_ClosingTagState();
-        $this->State[self::TSAX3_STATE_TAG] = new TSax3_TagState();
-        $this->State[self::TSAX3_STATE_OPENING_TAG] = new TSax3_OpeningTagState();
-
-        $this->State[self::TSAX3_STATE_PI] = new TSax3_PiState();
-        $this->State[self::TSAX3_STATE_JASP] = new TSax3_JaspState();
-        $this->State[self::TSAX3_STATE_ESCAPE] = new TSax3_EscapeState();
-    }
-
-    /**
-    * Moves the position back one character
-    * @access protected
-    * @return void
-    */
-    function unscanCharacter() {
-        $this->position -= 1;
-    }
-
-    /**
-    * Moves the position forward one character
-    * @access protected
-    * @return void
-    */
-    function ignoreCharacter() {
-        $this->position += 1;
-    }
-
-    /**
-    * Returns the next character from the XML document or void if at end
-    * @access protected
-    * @return mixed
-    */
-    function scanCharacter() {
-        if ($this->position < $this->length) {
-            return $this->rawtext{$this->position++};
-        }
-    }
-
-    /**
-    * Returns a string from the current position to the next occurance
-    * of the supplied string
-    * @param string string to search until
-    * @access protected
-    * @return string
-    */
-    function scanUntilString($string) {
-        $start = $this->position;
-        $this->position = strpos($this->rawtext, $string, $start);
-        if ($this->position === FALSE) {
-            $this->position = $this->length;
-        }
-        return substr($this->rawtext, $start, $this->position - $start);
-    }
-
-    /**
-    * Returns a string from the current position until the first instance of
-    * one of the characters in the supplied string argument
-    * @param string string to search until
-    * @access protected
-    * @return string
-    * @abstract
-    */
-    function scanUntilCharacters($string) {}
-
-    /**
-    * Moves the position forward past any whitespace characters
-    * @access protected
-    * @return void
-    * @abstract
-    */
-    function ignoreWhitespace() {}
-
-    /**
-    * Begins the parsing operation, setting up any decorators, depending on
-    * parse options invoking _parse() to execute parsing
-    * @param string XML document to parse
-    * @access protected
-    * @return void
-    */
-    function parse($data) {
-        if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES']==1) {
-            $decorator = new TSax3_Trim(
-                $this->handler_object_data,
-                $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
-            $this->handler_method_data = 'trimData';
-        }
-        if ($this->parser_options['XML_OPTION_CASE_FOLDING']==1) {
-            $open_decor = new TSax3_CaseFolding(
-                $this->handler_object_element,
-                $this->handler_method_opening,
-                $this->handler_method_closing);
-            $this->handler_object_element =& $open_decor;
-            $this->handler_method_opening ='foldOpen';
-            $this->handler_method_closing ='foldClose';
-        }
-        if ($this->parser_options['XML_OPTION_LINEFEED_BREAK']==1) {
-            $decorator = new TSax3_Linefeed(
-                $this->handler_object_data,
-                $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
-            $this->handler_method_data = 'breakData';
-        }
-        if ($this->parser_options['XML_OPTION_TAB_BREAK']==1) {
-            $decorator = new TSax3_Tab(
-                $this->handler_object_data,
-                $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
-            $this->handler_method_data = 'breakData';
-        }
-        if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED']==1) {
-            $decorator = new TSax3_Entities_Unparsed(
-                $this->handler_object_data,
-                $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
-            $this->handler_method_data = 'breakData';
-        }
-        if ($this->parser_options['XML_OPTION_ENTITIES_PARSED']==1) {
-            $decorator = new TSax3_Entities_Parsed(
-                $this->handler_object_data,
-                $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
-            $this->handler_method_data = 'breakData';
-        }
-        // Note switched on by default
-        if ($this->parser_options['XML_OPTION_STRIP_ESCAPES']==1) {
-            $decorator = new TSax3_Escape_Stripper(
-                $this->handler_object_escape,
-                $this->handler_method_escape);
-            $this->handler_object_escape =& $decorator;
-            $this->handler_method_escape = 'strip';
-        }
-        $this->rawtext = $data;
-        $this->length = strlen($data);
-        $this->position = 0;
-        $this->_parse();
-    }
-
-    /**
-    * Performs the parsing itself, delegating calls to a specific parser
-    * state
-    * @param constant state object to parse with
-    * @access protected
-    * @return void
-    */
-    function _parse($state = self::TSAX3_STATE_START) {
-        do {
-            $state = $this->State[$state]->parse($this);
-        } while ($state != self::TSAX3_STATE_STOP &&
-                    $this->position < $this->length);
-    }
+	/**
+	 * Constructs TSax3_StateParser setting up states
+	 * @var TSax3 instance of user front end class
+	 * @access protected
+	 */
+	protected function __construct($htmlsax) {
+		$this->htmlsax = $htmlsax;
+		$this->State[self::TSAX3_STATE_START] = new TSax3_StartingState();
+
+		$this->State[self::TSAX3_STATE_CLOSING_TAG] = new TSax3_ClosingTagState();
+		$this->State[self::TSAX3_STATE_TAG] = new TSax3_TagState();
+		$this->State[self::TSAX3_STATE_OPENING_TAG] = new TSax3_OpeningTagState();
+
+		$this->State[self::TSAX3_STATE_PI] = new TSax3_PiState();
+		$this->State[self::TSAX3_STATE_JASP] = new TSax3_JaspState();
+		$this->State[self::TSAX3_STATE_ESCAPE] = new TSax3_EscapeState();
+	}
+
+	/**
+	 * Moves the position back one character
+	 * @access protected
+	 * @return void
+	 */
+	function unscanCharacter() {
+		$this->position -= 1;
+	}
+
+	/**
+	 * Moves the position forward one character
+	 * @access protected
+	 * @return void
+	 */
+	function ignoreCharacter() {
+		$this->position += 1;
+	}
+
+	/**
+	 * Returns the next character from the XML document or void if at end
+	 * @access protected
+	 * @return mixed
+	 */
+	function scanCharacter() {
+		if ($this->position < $this->length) {
+			return $this->rawtext{$this->position++};
+		}
+	}
+
+	/**
+	 * Returns a string from the current position to the next occurance
+	 * of the supplied string
+	 * @param string string to search until
+	 * @access protected
+	 * @return string
+	 */
+	function scanUntilString($string) {
+		$start = $this->position;
+		$this->position = strpos($this->rawtext, $string, $start);
+		if ($this->position === FALSE) {
+			$this->position = $this->length;
+		}
+		return substr($this->rawtext, $start, $this->position - $start);
+	}
+
+	/**
+	 * Returns a string from the current position until the first instance of
+	 * one of the characters in the supplied string argument
+	 * @param string string to search until
+	 * @access protected
+	 * @return string
+	 * @abstract
+	 */
+	function scanUntilCharacters($string) {}
+
+	/**
+	 * Moves the position forward past any whitespace characters
+	 * @access protected
+	 * @return void
+	 * @abstract
+	 */
+	function ignoreWhitespace() {}
+
+	/**
+	 * Begins the parsing operation, setting up any decorators, depending on
+	 * parse options invoking _parse() to execute parsing
+	 * @param string XML document to parse
+	 * @access protected
+	 * @return void
+	 */
+	function parse($data) {
+		if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES']==1) {
+			$decorator = new TSax3_Trim(
+				$this->handler_object_data,
+				$this->handler_method_data);
+			$this->handler_object_data =& $decorator;
+			$this->handler_method_data = 'trimData';
+		}
+		if ($this->parser_options['XML_OPTION_CASE_FOLDING']==1) {
+			$open_decor = new TSax3_CaseFolding(
+				$this->handler_object_element,
+				$this->handler_method_opening,
+				$this->handler_method_closing);
+			$this->handler_object_element =& $open_decor;
+			$this->handler_method_opening ='foldOpen';
+			$this->handler_method_closing ='foldClose';
+		}
+		if ($this->parser_options['XML_OPTION_LINEFEED_BREAK']==1) {
+			$decorator = new TSax3_Linefeed(
+				$this->handler_object_data,
+				$this->handler_method_data);
+			$this->handler_object_data =& $decorator;
+			$this->handler_method_data = 'breakData';
+		}
+		if ($this->parser_options['XML_OPTION_TAB_BREAK']==1) {
+			$decorator = new TSax3_Tab(
+				$this->handler_object_data,
+				$this->handler_method_data);
+			$this->handler_object_data =& $decorator;
+			$this->handler_method_data = 'breakData';
+		}
+		if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED']==1) {
+			$decorator = new TSax3_Entities_Unparsed(
+				$this->handler_object_data,
+				$this->handler_method_data);
+			$this->handler_object_data =& $decorator;
+			$this->handler_method_data = 'breakData';
+		}
+		if ($this->parser_options['XML_OPTION_ENTITIES_PARSED']==1) {
+			$decorator = new TSax3_Entities_Parsed(
+				$this->handler_object_data,
+				$this->handler_method_data);
+			$this->handler_object_data =& $decorator;
+			$this->handler_method_data = 'breakData';
+		}
+		// Note switched on by default
+		if ($this->parser_options['XML_OPTION_STRIP_ESCAPES']==1) {
+			$decorator = new TSax3_Escape_Stripper(
+				$this->handler_object_escape,
+				$this->handler_method_escape);
+			$this->handler_object_escape =& $decorator;
+			$this->handler_method_escape = 'strip';
+		}
+		$this->rawtext = $data;
+		$this->length = strlen($data);
+		$this->position = 0;
+		$this->_parse();
+	}
+
+	/**
+	 * Performs the parsing itself, delegating calls to a specific parser
+	 * state
+	 * @param constant state object to parse with
+	 * @access protected
+	 * @return void
+	 */
+	function _parse($state = self::TSAX3_STATE_START) {
+		do {
+			$state = $this->State[$state]->parse($this);
+		} while ($state != self::TSAX3_STATE_STOP &&
+					$this->position < $this->length);
+	}
 }
 
 /**
@@ -327,61 +327,61 @@ 
 * @see TSax3_StateParser_Gtet430
 */
 class TSax3_StateParser_Lt430 extends TSax3_StateParser {
-    /**
-    * Constructs TSax3_StateParser_Lt430 defining available
-    * parser options
-    * @var TSax3 instance of user front end class
-    * @access protected
-    */
-    function __construct(& $htmlsax) {
-        parent::__construct($htmlsax);
-        $this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
-        $this->parser_options['XML_OPTION_CASE_FOLDING'] = 0;
-        $this->parser_options['XML_OPTION_LINEFEED_BREAK'] = 0;
-        $this->parser_options['XML_OPTION_TAB_BREAK'] = 0;
-        $this->parser_options['XML_OPTION_ENTITIES_PARSED'] = 0;
-        $this->parser_options['XML_OPTION_ENTITIES_UNPARSED'] = 0;
-        $this->parser_options['XML_OPTION_STRIP_ESCAPES'] = 0;
+	/**
+	 * Constructs TSax3_StateParser_Lt430 defining available
+	 * parser options
+	 * @var TSax3 instance of user front end class
+	 * @access protected
+	 */
+	function __construct(& $htmlsax) {
+		parent::__construct($htmlsax);
+		$this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
+		$this->parser_options['XML_OPTION_CASE_FOLDING'] = 0;
+		$this->parser_options['XML_OPTION_LINEFEED_BREAK'] = 0;
+		$this->parser_options['XML_OPTION_TAB_BREAK'] = 0;
+		$this->parser_options['XML_OPTION_ENTITIES_PARSED'] = 0;
+		$this->parser_options['XML_OPTION_ENTITIES_UNPARSED'] = 0;
+		$this->parser_options['XML_OPTION_STRIP_ESCAPES'] = 0;
 		//var_dump($this->parser_options);
-    }
-
-    /**
-    * Returns a string from the current position until the first instance of
-    * one of the characters in the supplied string argument
-    * @param string string to search until
-    * @access protected
-    * @return string
-    */
-    function scanUntilCharacters($string) {
-        $startpos = $this->position;
-        while ($this->position < $this->length && strpos($string, $this->rawtext{$this->position}) === FALSE) {
-            $this->position++;
-        }
-        return substr($this->rawtext, $startpos, $this->position - $startpos);
-    }
-
-    /**
-    * Moves the position forward past any whitespace characters
-    * @access protected
-    * @return void
-    */
-    function ignoreWhitespace() {
-        while ($this->position < $this->length &&
-            strpos(" \n\r\t", $this->rawtext{$this->position}) !== FALSE) {
-            $this->position++;
-        }
-    }
-
-    /**
-    * Begins the parsing operation, setting up the unparsed XML entities
-    * decorator if necessary then delegating further work to parent
-    * @param string XML document to parse
-    * @access protected
-    * @return void
-    */
-    function parse($data) {
-        parent::parse($data);
-    }
+	}
+
+	/**
+	 * Returns a string from the current position until the first instance of
+	 * one of the characters in the supplied string argument
+	 * @param string string to search until
+	 * @access protected
+	 * @return string
+	 */
+	function scanUntilCharacters($string) {
+		$startpos = $this->position;
+		while ($this->position < $this->length && strpos($string, $this->rawtext{$this->position}) === FALSE) {
+			$this->position++;
+		}
+		return substr($this->rawtext, $startpos, $this->position - $startpos);
+	}
+
+	/**
+	 * Moves the position forward past any whitespace characters
+	 * @access protected
+	 * @return void
+	 */
+	function ignoreWhitespace() {
+		while ($this->position < $this->length &&
+			strpos(" \n\r\t", $this->rawtext{$this->position}) !== FALSE) {
+			$this->position++;
+		}
+	}
+
+	/**
+	 * Begins the parsing operation, setting up the unparsed XML entities
+	 * decorator if necessary then delegating further work to parent
+	 * @param string XML document to parse
+	 * @access protected
+	 * @return void
+	 */
+	function parse($data) {
+		parent::parse($data);
+	}
 }
 
 /**
@@ -392,56 +392,56 @@ 
 * @see TSax3_StateParser_Lt430
 */
 class TSax3_StateParser_Gtet430 extends TSax3_StateParser {
-    /**
-    * Constructs TSax3_StateParser_Gtet430 defining available
-    * parser options
-    * @var TSax3 instance of user front end class
-    * @access protected
-    */
-    function __construct(& $htmlsax) {
-        parent::__construct($htmlsax);
-        $this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
-        $this->parser_options['XML_OPTION_CASE_FOLDING'] = 0;
-        $this->parser_options['XML_OPTION_LINEFEED_BREAK'] = 0;
-        $this->parser_options['XML_OPTION_TAB_BREAK'] = 0;
-        $this->parser_options['XML_OPTION_ENTITIES_PARSED'] = 0;
-        $this->parser_options['XML_OPTION_ENTITIES_UNPARSED'] = 0;
-        $this->parser_options['XML_OPTION_STRIP_ESCAPES'] = 0;
-    }
-    /**
-    * Returns a string from the current position until the first instance of
-    * one of the characters in the supplied string argument.
-    * @param string string to search until
-    * @access protected
-    * @return string
-    */
-    function scanUntilCharacters($string) {
-        $startpos = $this->position;
-        $length = strcspn($this->rawtext, $string, $startpos);
-        $this->position += $length;
-        return substr($this->rawtext, $startpos, $length);
-    }
-
-    /**
-    * Moves the position forward past any whitespace characters
-    * @access protected
-    * @return void
-    */
-    function ignoreWhitespace() {
-        $this->position += strspn($this->rawtext, " \n\r\t", $this->position);
-    }
-
-    /**
-    * Begins the parsing operation, setting up the parsed and unparsed
-    * XML entity decorators if necessary then delegating further work
-    * to parent
-    * @param string XML document to parse
-    * @access protected
-    * @return void
-    */
-    function parse($data) {
-        parent::parse($data);
-    }
+	/**
+	 * Constructs TSax3_StateParser_Gtet430 defining available
+	 * parser options
+	 * @var TSax3 instance of user front end class
+	 * @access protected
+	 */
+	function __construct(& $htmlsax) {
+		parent::__construct($htmlsax);
+		$this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
+		$this->parser_options['XML_OPTION_CASE_FOLDING'] = 0;
+		$this->parser_options['XML_OPTION_LINEFEED_BREAK'] = 0;
+		$this->parser_options['XML_OPTION_TAB_BREAK'] = 0;
+		$this->parser_options['XML_OPTION_ENTITIES_PARSED'] = 0;
+		$this->parser_options['XML_OPTION_ENTITIES_UNPARSED'] = 0;
+		$this->parser_options['XML_OPTION_STRIP_ESCAPES'] = 0;
+	}
+	/**
+	 * Returns a string from the current position until the first instance of
+	 * one of the characters in the supplied string argument.
+	 * @param string string to search until
+	 * @access protected
+	 * @return string
+	 */
+	function scanUntilCharacters($string) {
+		$startpos = $this->position;
+		$length = strcspn($this->rawtext, $string, $startpos);
+		$this->position += $length;
+		return substr($this->rawtext, $startpos, $length);
+	}
+
+	/**
+	 * Moves the position forward past any whitespace characters
+	 * @access protected
+	 * @return void
+	 */
+	function ignoreWhitespace() {
+		$this->position += strspn($this->rawtext, " \n\r\t", $this->position);
+	}
+
+	/**
+	 * Begins the parsing operation, setting up the parsed and unparsed
+	 * XML entity decorators if necessary then delegating further work
+	 * to parent
+	 * @param string XML document to parse
+	 * @access protected
+	 * @return void
+	 */
+	function parse($data) {
+		parent::parse($data);
+	}
 }
 
 /**
@@ -450,13 +450,13 @@ 
 * @access protected
 */
 class TSax3_NullHandler {
-    /**
-    * Generic handler method which does nothing
-    * @access protected
-    * @return void
-    */
-    function DoNothing() {
-    }
+	/**
+	 * Generic handler method which does nothing
+	 * @access protected
+	 * @return void
+	 */
+	function DoNothing() {
+	}
 }
 
 /**
@@ -465,229 +465,229 @@ 
 * @access public
 */
 class TSax3 {
-    /**
-    * Instance of concrete subclass of TSax3_StateParser
-    * @var TSax3_StateParser
-    * @access private
-    */
-    private $state_parser;
-
-    /**
-    * Constructs TSax3 selecting concrete StateParser subclass
-    * depending on PHP version being used as well as setting the default
-    * NullHandler for all callbacks<br />
-    * <b>Example:</b>
-    * <pre>
-    * $myHandler = & new MyHandler();
-    * $parser = new TSax3();
-    * $parser->set_object($myHandler);
-    * $parser->set_option('XML_OPTION_CASE_FOLDING');
-    * $parser->set_element_handler('myOpenHandler','myCloseHandler');
-    * $parser->set_data_handler('myDataHandler');
-    * $parser->parser($xml);
-    * </pre>
-    * @access public
-    */
-    function __construct() {
-        if (version_compare(phpversion(), '4.3', 'ge')) {
-            $this->state_parser = new TSax3_StateParser_Gtet430($this);
-        } else {
-            $this->state_parser = new TSax3_StateParser_Lt430($this);
-        }
-        $nullhandler = new TSax3_NullHandler();
-        $this->set_object($nullhandler);
-        $this->set_element_handler('DoNothing', 'DoNothing');
-        $this->set_data_handler('DoNothing');
-        $this->set_pi_handler('DoNothing');
-        $this->set_jasp_handler('DoNothing');
-        $this->set_escape_handler('DoNothing');
-    }
-
-    /**
-    * Sets the user defined handler object. Returns a PEAR Error
-    * if supplied argument is not an object.
-    * @param object handler object containing SAX callback methods
-    * @access public
-    * @return mixed
-    */
-    function set_object(&$object) {
-        if ( is_object($object) ) {
-            $this->state_parser->handler_default =& $object;
-            return true;
-        } else {
-            require_once('PEAR.php');
-            PEAR::raiseError('TSax3::set_object requires '.
-                'an object instance');
-        }
-    }
-
-    /**
-    * Sets a parser option. By default all options are switched off.
-    * Returns a PEAR Error if option is invalid<br />
-    * <b>Available options:</b>
-    * <ul>
-    * <li>XML_OPTION_TRIM_DATA_NODES: trim whitespace off the beginning
-    * and end of data passed to the data handler</li>
-    * <li>XML_OPTION_LINEFEED_BREAK: linefeeds result in additional data
-    * handler calls</li>
-    * <li>XML_OPTION_TAB_BREAK: tabs result in additional data handler
-    * calls</li>
-    * <li>XML_OPTION_ENTITIES_UNPARSED: XML entities are returned as
-    * seperate data handler calls in unparsed form</li>
-    * <li>XML_OPTION_ENTITIES_PARSED: (PHP 4.3.0+ only) XML entities are
-    * returned as seperate data handler calls and are parsed with
-    * PHP's html_entity_decode() function</li>
-    * <li>XML_OPTION_STRIP_ESCAPES: strips out the -- -- comment markers
-    * or CDATA markup inside an XML escape, if found.</li>
-    * </ul>
-    * To get HTMLSax to behave in the same way as the native PHP SAX parser,
-    * using it's default state, you need to switch on XML_OPTION_LINEFEED_BREAK,
-    * XML_OPTION_ENTITIES_PARSED and XML_OPTION_CASE_FOLDING
-    * @param string name of parser option
-    * @param int (optional) 1 to switch on, 0 for off
-    * @access public
-    * @return boolean
-    */
-    function set_option($name, $value=1) {
-        if ( array_key_exists($name,$this->state_parser->parser_options) ) {
-            $this->state_parser->parser_options[$name] = $value;
-            return true;
-        } else {
-            require_once('PEAR.php');
-            PEAR::raiseError('TSax3::set_option('.$name.') illegal');
-        }
-    }
-
-    /**
-    * Sets the data handler method which deals with the contents of XML
-    * elements.<br />
-    * The handler method must accept two arguments, the first being an
-    * instance of TSax3 and the second being the contents of an
-    * XML element e.g.
-    * <pre>
-    * function myDataHander(& $parser,$data){}
-    * </pre>
-    * @param string name of method
-    * @access public
-    * @return void
-    * @see set_object
-    */
-    function set_data_handler($data_method) {
-        $this->state_parser->handler_object_data =& $this->state_parser->handler_default;
-        $this->state_parser->handler_method_data = $data_method;
-    }
-
-    /**
-    * Sets the open and close tag handlers
-    * <br />The open handler method must accept three arguments; the parser,
-    * the tag name and an array of attributes e.g.
-    * <pre>
-    * function myOpenHander(& $parser,$tagname,$attrs=array()){}
-    * </pre>
-    * The close handler method must accept two arguments; the parser and
-    * the tag name e.g.
-    * <pre>
-    * function myCloseHander(& $parser,$tagname){}
-    * </pre>
-    * @param string name of open method
-    * @param string name of close method
-    * @access public
-    * @return void
-    * @see set_object
-    */
-    function set_element_handler($opening_method, $closing_method) {
-        $this->state_parser->handler_object_element =& $this->state_parser->handler_default;
-        $this->state_parser->handler_method_opening = $opening_method;
-        $this->state_parser->handler_method_closing = $closing_method;
-    }
-
-    /**
-    * Sets the processing instruction handler method e.g. for PHP open
-    * and close tags<br />
-    * The handler method must accept three arguments; the parser, the
-    * PI target and data inside the PI
-    * <pre>
-    * function myPIHander(& $parser,$target, $data){}
-    * </pre>
-    * @param string name of method
-    * @access public
-    * @return void
-    * @see set_object
-    */
-    function set_pi_handler($pi_method) {
-        $this->state_parser->handler_object_pi =& $this->state_parser->handler_default;
-        $this->state_parser->handler_method_pi = $pi_method;
-    }
-
-    /**
-    * Sets the XML escape handler method e.g. for comments and doctype
-    * declarations<br />
-    * The handler method must accept two arguments; the parser and the
-    * contents of the escaped section
-    * <pre>
-    * function myEscapeHander(& $parser, $data){}
-    * </pre>
-    * @param string name of method
-    * @access public
-    * @return void
-    * @see set_object
-    */
-    function set_escape_handler($escape_method) {
-        $this->state_parser->handler_object_escape =& $this->state_parser->handler_default;
-        $this->state_parser->handler_method_escape = $escape_method;
-    }
-
-    /**
-    * Sets the JSP/ASP markup handler<br />
-    * The handler method must accept two arguments; the parser and
-    * body of the JASP tag
-    * <pre>
-    * function myJaspHander(& $parser, $data){}
-    * </pre>
-    * @param string name of method
-    * @access public
-    * @return void
-    * @see set_object
-    */
-    function set_jasp_handler ($jasp_method) {
-        $this->state_parser->handler_object_jasp =& $this->state_parser->handler_default;
-        $this->state_parser->handler_method_jasp = $jasp_method;
-    }
-
-    /**
-    * Returns the current string position of the "cursor" inside the XML
-    * document
-    * <br />Intended for use from within a user defined handler called
-    * via the $parser reference e.g.
-    * <pre>
-    * function myDataHandler(& $parser,$data) {
-    *     echo( 'Current position: '.$parser->get_current_position() );
-    * }
-    * </pre>
-    * @access public
-    * @return int
-    * @see get_length
-    */
-    function get_current_position() {
-        return $this->state_parser->position;
-    }
-
-    /**
-    * Returns the string length of the XML document being parsed
-    * @access public
-    * @return int
-    */
-    function get_length() {
-        return $this->state_parser->length;
-    }
-
-    /**
-    * Start parsing some XML
-    * @param string XML document
-    * @access public
-    * @return void
-    */
-    function parse($data) {
-        $this->state_parser->parse($data);
-    }
+	/**
+	 * Instance of concrete subclass of TSax3_StateParser
+	 * @var TSax3_StateParser
+	 * @access private
+	 */
+	private $state_parser;
+
+	/**
+	 * Constructs TSax3 selecting concrete StateParser subclass
+	 * depending on PHP version being used as well as setting the default
+	 * NullHandler for all callbacks<br />
+	 * <b>Example:</b>
+	 * <pre>
+	 * $myHandler = & new MyHandler();
+	 * $parser = new TSax3();
+	 * $parser->set_object($myHandler);
+	 * $parser->set_option('XML_OPTION_CASE_FOLDING');
+	 * $parser->set_element_handler('myOpenHandler','myCloseHandler');
+	 * $parser->set_data_handler('myDataHandler');
+	 * $parser->parser($xml);
+	 * </pre>
+	 * @access public
+	 */
+	function __construct() {
+		if (version_compare(phpversion(), '4.3', 'ge')) {
+			$this->state_parser = new TSax3_StateParser_Gtet430($this);
+		} else {
+			$this->state_parser = new TSax3_StateParser_Lt430($this);
+		}
+		$nullhandler = new TSax3_NullHandler();
+		$this->set_object($nullhandler);
+		$this->set_element_handler('DoNothing', 'DoNothing');
+		$this->set_data_handler('DoNothing');
+		$this->set_pi_handler('DoNothing');
+		$this->set_jasp_handler('DoNothing');
+		$this->set_escape_handler('DoNothing');
+	}
+
+	/**
+	 * Sets the user defined handler object. Returns a PEAR Error
+	 * if supplied argument is not an object.
+	 * @param object handler object containing SAX callback methods
+	 * @access public
+	 * @return mixed
+	 */
+	function set_object(&$object) {
+		if ( is_object($object) ) {
+			$this->state_parser->handler_default =& $object;
+			return true;
+		} else {
+			require_once('PEAR.php');
+			PEAR::raiseError('TSax3::set_object requires '.
+				'an object instance');
+		}
+	}
+
+	/**
+	 * Sets a parser option. By default all options are switched off.
+	 * Returns a PEAR Error if option is invalid<br />
+	 * <b>Available options:</b>
+	 * <ul>
+	 * <li>XML_OPTION_TRIM_DATA_NODES: trim whitespace off the beginning
+	 * and end of data passed to the data handler</li>
+	 * <li>XML_OPTION_LINEFEED_BREAK: linefeeds result in additional data
+	 * handler calls</li>
+	 * <li>XML_OPTION_TAB_BREAK: tabs result in additional data handler
+	 * calls</li>
+	 * <li>XML_OPTION_ENTITIES_UNPARSED: XML entities are returned as
+	 * seperate data handler calls in unparsed form</li>
+	 * <li>XML_OPTION_ENTITIES_PARSED: (PHP 4.3.0+ only) XML entities are
+	 * returned as seperate data handler calls and are parsed with
+	 * PHP's html_entity_decode() function</li>
+	 * <li>XML_OPTION_STRIP_ESCAPES: strips out the -- -- comment markers
+	 * or CDATA markup inside an XML escape, if found.</li>
+	 * </ul>
+	 * To get HTMLSax to behave in the same way as the native PHP SAX parser,
+	 * using it's default state, you need to switch on XML_OPTION_LINEFEED_BREAK,
+	 * XML_OPTION_ENTITIES_PARSED and XML_OPTION_CASE_FOLDING
+	 * @param string name of parser option
+	 * @param int (optional) 1 to switch on, 0 for off
+	 * @access public
+	 * @return boolean
+	 */
+	function set_option($name, $value=1) {
+		if ( array_key_exists($name,$this->state_parser->parser_options) ) {
+			$this->state_parser->parser_options[$name] = $value;
+			return true;
+		} else {
+			require_once('PEAR.php');
+			PEAR::raiseError('TSax3::set_option('.$name.') illegal');
+		}
+	}
+
+	/**
+	 * Sets the data handler method which deals with the contents of XML
+	 * elements.<br />
+	 * The handler method must accept two arguments, the first being an
+	 * instance of TSax3 and the second being the contents of an
+	 * XML element e.g.
+	 * <pre>
+	 * function myDataHander(& $parser,$data){}
+	 * </pre>
+	 * @param string name of method
+	 * @access public
+	 * @return void
+	 * @see set_object
+	 */
+	function set_data_handler($data_method) {
+		$this->state_parser->handler_object_data =& $this->state_parser->handler_default;
+		$this->state_parser->handler_method_data = $data_method;
+	}
+
+	/**
+	 * Sets the open and close tag handlers
+	 * <br />The open handler method must accept three arguments; the parser,
+	 * the tag name and an array of attributes e.g.
+	 * <pre>
+	 * function myOpenHander(& $parser,$tagname,$attrs=array()){}
+	 * </pre>
+	 * The close handler method must accept two arguments; the parser and
+	 * the tag name e.g.
+	 * <pre>
+	 * function myCloseHander(& $parser,$tagname){}
+	 * </pre>
+	 * @param string name of open method
+	 * @param string name of close method
+	 * @access public
+	 * @return void
+	 * @see set_object
+	 */
+	function set_element_handler($opening_method, $closing_method) {
+		$this->state_parser->handler_object_element =& $this->state_parser->handler_default;
+		$this->state_parser->handler_method_opening = $opening_method;
+		$this->state_parser->handler_method_closing = $closing_method;
+	}
+
+	/**
+	 * Sets the processing instruction handler method e.g. for PHP open
+	 * and close tags<br />
+	 * The handler method must accept three arguments; the parser, the
+	 * PI target and data inside the PI
+	 * <pre>
+	 * function myPIHander(& $parser,$target, $data){}
+	 * </pre>
+	 * @param string name of method
+	 * @access public
+	 * @return void
+	 * @see set_object
+	 */
+	function set_pi_handler($pi_method) {
+		$this->state_parser->handler_object_pi =& $this->state_parser->handler_default;
+		$this->state_parser->handler_method_pi = $pi_method;
+	}
+
+	/**
+	 * Sets the XML escape handler method e.g. for comments and doctype
+	 * declarations<br />
+	 * The handler method must accept two arguments; the parser and the
+	 * contents of the escaped section
+	 * <pre>
+	 * function myEscapeHander(& $parser, $data){}
+	 * </pre>
+	 * @param string name of method
+	 * @access public
+	 * @return void
+	 * @see set_object
+	 */
+	function set_escape_handler($escape_method) {
+		$this->state_parser->handler_object_escape =& $this->state_parser->handler_default;
+		$this->state_parser->handler_method_escape = $escape_method;
+	}
+
+	/**
+	 * Sets the JSP/ASP markup handler<br />
+	 * The handler method must accept two arguments; the parser and
+	 * body of the JASP tag
+	 * <pre>
+	 * function myJaspHander(& $parser, $data){}
+	 * </pre>
+	 * @param string name of method
+	 * @access public
+	 * @return void
+	 * @see set_object
+	 */
+	function set_jasp_handler ($jasp_method) {
+		$this->state_parser->handler_object_jasp =& $this->state_parser->handler_default;
+		$this->state_parser->handler_method_jasp = $jasp_method;
+	}
+
+	/**
+	 * Returns the current string position of the "cursor" inside the XML
+	 * document
+	 * <br />Intended for use from within a user defined handler called
+	 * via the $parser reference e.g.
+	 * <pre>
+	 * function myDataHandler(& $parser,$data) {
+	 *     echo( 'Current position: '.$parser->get_current_position() );
+	 * }
+	 * </pre>
+	 * @access public
+	 * @return int
+	 * @see get_length
+	 */
+	function get_current_position() {
+		return $this->state_parser->position;
+	}
+
+	/**
+	 * Returns the string length of the XML document being parsed
+	 * @access public
+	 * @return int
+	 */
+	function get_length() {
+		return $this->state_parser->length;
+	}
+
+	/**
+	 * Start parsing some XML
+	 * @param string XML document
+	 * @access public
+	 * @return void
+	 */
+	function parse($data) {
+		$this->state_parser->parse($data);
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -29,8 +29,8 @@ 
 * Required classes
 */
 
-require_once(dirname(__FILE__).'/HTMLSax3/States.php');
-require_once(dirname(__FILE__).'/HTMLSax3/Decorators.php');
+require_once(dirname(__FILE__) . '/HTMLSax3/States.php');
+require_once(dirname(__FILE__) . '/HTMLSax3/Decorators.php');
 
 /**
 * Base State Parser
@@ -246,56 +246,56 @@ 
     * @return void
     */
     function parse($data) {
-        if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES']==1) {
+        if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES'] == 1) {
             $decorator = new TSax3_Trim(
                 $this->handler_object_data,
                 $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
+            $this->handler_object_data = & $decorator;
             $this->handler_method_data = 'trimData';
         }
-        if ($this->parser_options['XML_OPTION_CASE_FOLDING']==1) {
+        if ($this->parser_options['XML_OPTION_CASE_FOLDING'] == 1) {
             $open_decor = new TSax3_CaseFolding(
                 $this->handler_object_element,
                 $this->handler_method_opening,
                 $this->handler_method_closing);
-            $this->handler_object_element =& $open_decor;
-            $this->handler_method_opening ='foldOpen';
-            $this->handler_method_closing ='foldClose';
+            $this->handler_object_element = & $open_decor;
+            $this->handler_method_opening = 'foldOpen';
+            $this->handler_method_closing = 'foldClose';
         }
-        if ($this->parser_options['XML_OPTION_LINEFEED_BREAK']==1) {
+        if ($this->parser_options['XML_OPTION_LINEFEED_BREAK'] == 1) {
             $decorator = new TSax3_Linefeed(
                 $this->handler_object_data,
                 $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
+            $this->handler_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
-        if ($this->parser_options['XML_OPTION_TAB_BREAK']==1) {
+        if ($this->parser_options['XML_OPTION_TAB_BREAK'] == 1) {
             $decorator = new TSax3_Tab(
                 $this->handler_object_data,
                 $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
+            $this->handler_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
-        if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED']==1) {
+        if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED'] == 1) {
             $decorator = new TSax3_Entities_Unparsed(
                 $this->handler_object_data,
                 $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
+            $this->handler_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
-        if ($this->parser_options['XML_OPTION_ENTITIES_PARSED']==1) {
+        if ($this->parser_options['XML_OPTION_ENTITIES_PARSED'] == 1) {
             $decorator = new TSax3_Entities_Parsed(
                 $this->handler_object_data,
                 $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
+            $this->handler_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
         // Note switched on by default
-        if ($this->parser_options['XML_OPTION_STRIP_ESCAPES']==1) {
+        if ($this->parser_options['XML_OPTION_STRIP_ESCAPES'] == 1) {
             $decorator = new TSax3_Escape_Stripper(
                 $this->handler_object_escape,
                 $this->handler_method_escape);
-            $this->handler_object_escape =& $decorator;
+            $this->handler_object_escape = & $decorator;
             $this->handler_method_escape = 'strip';
         }
         $this->rawtext = $data;
@@ -511,12 +511,12 @@ 
     * @return mixed
     */
     function set_object(&$object) {
-        if ( is_object($object) ) {
-            $this->state_parser->handler_default =& $object;
+        if (is_object($object)) {
+            $this->state_parser->handler_default = & $object;
             return true;
         } else {
             require_once('PEAR.php');
-            PEAR::raiseError('TSax3::set_object requires '.
+            PEAR::raiseError('TSax3::set_object requires ' .
                 'an object instance');
         }
     }
@@ -548,13 +548,13 @@ 
     * @access public
     * @return boolean
     */
-    function set_option($name, $value=1) {
-        if ( array_key_exists($name,$this->state_parser->parser_options) ) {
+    function set_option($name, $value = 1) {
+        if (array_key_exists($name, $this->state_parser->parser_options)) {
             $this->state_parser->parser_options[$name] = $value;
             return true;
         } else {
             require_once('PEAR.php');
-            PEAR::raiseError('TSax3::set_option('.$name.') illegal');
+            PEAR::raiseError('TSax3::set_option(' . $name . ') illegal');
         }
     }
 
@@ -573,7 +573,7 @@ 
     * @see set_object
     */
     function set_data_handler($data_method) {
-        $this->state_parser->handler_object_data =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_data = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_data = $data_method;
     }
 
@@ -596,7 +596,7 @@ 
     * @see set_object
     */
     function set_element_handler($opening_method, $closing_method) {
-        $this->state_parser->handler_object_element =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_element = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_opening = $opening_method;
         $this->state_parser->handler_method_closing = $closing_method;
     }
@@ -615,7 +615,7 @@ 
     * @see set_object
     */
     function set_pi_handler($pi_method) {
-        $this->state_parser->handler_object_pi =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_pi = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_pi = $pi_method;
     }
 
@@ -633,7 +633,7 @@ 
     * @see set_object
     */
     function set_escape_handler($escape_method) {
-        $this->state_parser->handler_object_escape =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_escape = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_escape = $escape_method;
     }
 
@@ -649,8 +649,8 @@ 
     * @return void
     * @see set_object
     */
-    function set_jasp_handler ($jasp_method) {
-        $this->state_parser->handler_object_jasp =& $this->state_parser->handler_default;
+    function set_jasp_handler($jasp_method) {
+        $this->state_parser->handler_object_jasp = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_jasp = $jasp_method;
     }