pradosoft / prado

framework/Collections/TPriorityList.php

Spacing +174 added lines, -174 removed lines

@@ -50,27 +50,27 @@ 
 	/**
 	 * @var array internal data storage
 	 */
-	private $_d=array();
+	private $_d = array();
 	/**
 	 * @var boolean indicates if the _d is currently ordered.
 	 */
-	private $_o=false;
+	private $_o = false;
 	/**
 	 * @var array cached flattened internal data storage
 	 */
-	private $_fd=null;
+	private $_fd = null;
 	/**
 	 * @var integer number of items contain within the list
 	 */
-	private $_c=0;
+	private $_c = 0;
 	/**
 	 * @var numeric the default priority of items without specified priorities
 	 */
-	private $_dp=10;
+	private $_dp = 10;
 	/**
 	 * @var integer the precision of the numeric priorities within this priority list.
 	 */
-	private $_p=8;
+	private $_p = 8;
 
 	/**
 	 * Constructor.
@@ -81,10 +81,10 @@ 
 	 * @param integer the precision of the numeric priorities
 	 * @throws TInvalidDataTypeException If data is not null and is neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
+	public function __construct($data = null, $readOnly = false, $defaultPriority = 10, $precision = 8)
 	{
 		parent::__construct();
-		if($data!==null)
+		if ($data !== null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
@@ -115,13 +115,13 @@ 
 	 * @param numeric optional priority at which to count items.  if no parameter, it will be set to the default {@link getDefaultPriority}
 	 * @return integer the number of items in the list at the specified priority
 	 */
-	public function getPriorityCount($priority=null)
+	public function getPriorityCount($priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
+		if (!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
 		return count($this->_d[$priority]);
 	}
@@ -140,7 +140,7 @@ 
 	 */
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp=(string)round(TPropertyValue::ensureFloat($value),$this->_p);
+		$this->_dp = (string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	protected function setPrecision($value)
 	{
-		$this->_p=TPropertyValue::ensureInteger($value);
+		$this->_p = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -185,9 +185,9 @@ 
 	 * This orders the priority list internally.
 	 */
 	protected function sortPriorities() {
-		if(!$this->_o) {
-			ksort($this->_d,SORT_NUMERIC);
-			$this->_o=true;
+		if (!$this->_o) {
+			ksort($this->_d, SORT_NUMERIC);
+			$this->_o = true;
 		}
 	}
 
@@ -196,13 +196,13 @@ 
 	 * @return array array of items in the list in priority and index order
 	 */
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
+		if (is_array($this->_fd))
 			return $this->_fd;
 
 		$this->sortPriorities();
-		$this->_fd=array();
-		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd=array_merge($this->_fd,$itemsatpriority);
+		$this->_fd = array();
+		foreach ($this->_d as $priority => $itemsatpriority)
+			$this->_fd = array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 
@@ -216,11 +216,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0&&$index<$this->getCount()) {
-			$arr=$this->flattenPriorities();
+		if ($index >= 0 && $index < $this->getCount()) {
+			$arr = $this->flattenPriorities();
 			return $arr[$index];
 		} else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -228,13 +228,13 @@ 
 	 * @param numeric priority of the items to get.  Defaults to null, filled in with the default priority, if left blank.
 	 * @return array all items at priority in index order, null if there are no items at that priority
 	 */
-	public function itemsAtPriority($priority=null)
+	public function itemsAtPriority($priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		return isset($this->_d[$priority])?$this->_d[$priority]:null;
+		return isset($this->_d[$priority]) ? $this->_d[$priority] : null;
 	}
 
 	/**
@@ -243,14 +243,14 @@ 
 	 * @param numeric the priority which to index.  no parameter or null will result in the default priority
 	 * @return mixed the element at the offset, false if no element is found at the offset
 	 */
-	public function itemAtIndexInPriority($index,$priority=null)
+	public function itemAtIndexInPriority($index, $priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		return !isset($this->_d[$priority])?false:(
-				isset($this->_d[$priority][$index])?$this->_d[$priority][$index]:false
+		return !isset($this->_d[$priority]) ? false : (
+				isset($this->_d[$priority][$index]) ? $this->_d[$priority][$index] : false
 			);
 	}
 
@@ -262,12 +262,12 @@ 
 	 * @return int the index within the flattened array
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function add($item,$priority=null)
+	public function add($item, $priority = null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		return $this->insertAtIndexInPriority($item,false,$priority,true);
+		return $this->insertAtIndexInPriority($item, false, $priority, true);
 	}
 
 	/**
@@ -278,15 +278,15 @@ 
 	 * @throws TInvalidDataValueException If the index specified exceeds the bound
 	 * @throws TInvalidOperationException if the list is read-only
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority=$this->priorityAt($index,true))!==false)
-			$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		if (($priority = $this->priorityAt($index, true)) !== false)
+			$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -299,56 +299,56 @@ 
 	 * @throws TInvalidDataValueException If the index specified exceeds the bound
 	 * @throws TInvalidOperationException if the list is read-only
 	 */
-	public function insertAtIndexInPriority($item,$index=false,$priority=null,$preserveCache=false)
+	public function insertAtIndexInPriority($item, $index = false, $priority = null, $preserveCache = false)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		if($preserveCache) {
+		if ($preserveCache) {
 			$this->sortPriorities();
-			$cc=0;
-			foreach($this->_d as $prioritykey=>$items)
-				if($prioritykey>=$priority)
+			$cc = 0;
+			foreach ($this->_d as $prioritykey=>$items)
+				if ($prioritykey >= $priority)
 					break;
 				else
-					$cc+=count($items);
-
-			if($index===false&&isset($this->_d[$priority])) {
-				$c=count($this->_d[$priority]);
-				$c+=$cc;
-				$this->_d[$priority][]=$item;
-			} else if(isset($this->_d[$priority])) {
-				$c=$index+$cc;
-				array_splice($this->_d[$priority],$index,0,array($item));
+					$cc += count($items);
+
+			if ($index === false && isset($this->_d[$priority])) {
+				$c = count($this->_d[$priority]);
+				$c += $cc;
+				$this->_d[$priority][] = $item;
+			} else if (isset($this->_d[$priority])) {
+				$c = $index + $cc;
+				array_splice($this->_d[$priority], $index, 0, array($item));
 			} else {
 				$c = $cc;
 				$this->_o = false;
-				$this->_d[$priority]=array($item);
+				$this->_d[$priority] = array($item);
 			}
 
-			if($this->_fd&&is_array($this->_fd)) // if there is a flattened array cache
-				array_splice($this->_fd,$c,0,array($item));
+			if ($this->_fd && is_array($this->_fd)) // if there is a flattened array cache
+				array_splice($this->_fd, $c, 0, array($item));
 		} else {
-			$c=null;
-			if($index===false&&isset($this->_d[$priority])) {
-				$cc=count($this->_d[$priority]);
-				$this->_d[$priority][]=$item;
-			} else if(isset($this->_d[$priority])) {
-				$cc=$index;
-				array_splice($this->_d[$priority],$index,0,array($item));
+			$c = null;
+			if ($index === false && isset($this->_d[$priority])) {
+				$cc = count($this->_d[$priority]);
+				$this->_d[$priority][] = $item;
+			} else if (isset($this->_d[$priority])) {
+				$cc = $index;
+				array_splice($this->_d[$priority], $index, 0, array($item));
 			} else {
-				$cc=0;
-				$this->_o=false;
-				$this->_d[$priority]=array($item);
+				$cc = 0;
+				$this->_o = false;
+				$this->_d[$priority] = array($item);
 			}
-			if($this->_fd&&is_array($this->_fd)&&count($this->_d)==1)
-				array_splice($this->_fd,$cc,0,array($item));
+			if ($this->_fd && is_array($this->_fd) && count($this->_d) == 1)
+				array_splice($this->_fd, $cc, 0, array($item));
 			else
-				$this->_fd=null;
+				$this->_fd = null;
 		}
 
 		$this->_c++;
@@ -367,22 +367,22 @@ 
 	 * @return integer index within the flattened list at which the item is being removed
 	 * @throws TInvalidDataValueException If the item does not exist
 	 */
-	public function remove($item,$priority=false)
+	public function remove($item, $priority = false)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($p=$this->priorityOf($item,true))!==false)
+		if (($p = $this->priorityOf($item, true)) !== false)
 		{
-			if($priority!==false) {
-				if($priority===null)
-					$priority=$this->getDefaultPriority();
-				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+			if ($priority !== false) {
+				if ($priority === null)
+					$priority = $this->getDefaultPriority();
+				$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-				if($p[0]!=$priority)
+				if ($p[0] != $priority)
 					throw new TInvalidDataValueException('list_item_inexistent');
 			}
-			$this->removeAtIndexInPriority($p[1],$p[0]);
+			$this->removeAtIndexInPriority($p[1], $p[0]);
 			return $p[2];
 		}
 		else
@@ -398,12 +398,12 @@ 
 	 */
 	public function removeAt($index)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority=$this->priorityAt($index, true))!==false)
-			return $this->removeAtIndexInPriority($priority[1],$priority[0]);
-		throw new TInvalidDataValueException('list_index_invalid',$index);
+		if (($priority = $this->priorityAt($index, true)) !== false)
+			return $this->removeAtIndexInPriority($priority[1], $priority[0]);
+		throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -414,27 +414,27 @@ 
 	 * @return mixed the removed item.
 	 * @throws TInvalidDataValueException If the item does not exist
 	 */
-	public function removeAtIndexInPriority($index, $priority=null)
+	public function removeAtIndexInPriority($index, $priority = null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		if(!isset($this->_d[$priority])||$index<0||$index>=count($this->_d[$priority]))
+		if (!isset($this->_d[$priority]) || $index < 0 || $index >= count($this->_d[$priority]))
 			throw new TInvalidDataValueException('list_item_inexistent');
 
 		// $value is an array of elements removed, only one
-		$value=array_splice($this->_d[$priority],$index,1);
-		$value=$value[0];
+		$value = array_splice($this->_d[$priority], $index, 1);
+		$value = $value[0];
 
-		if(!count($this->_d[$priority]))
+		if (!count($this->_d[$priority]))
 			unset($this->_d[$priority]);
 
 		$this->_c--;
-		$this->_fd=null;
+		$this->_fd = null;
 		return $value;
 	}
 
@@ -443,13 +443,13 @@ 
 	 */
 	public function clear()
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		$d=array_reverse($this->_d,true);
-		foreach($this->_d as $priority=>$items) {
-			for($index=count($items)-1;$index>=0;$index--)
-				$this->removeAtIndexInPriority($index,$priority);
+		$d = array_reverse($this->_d, true);
+		foreach ($this->_d as $priority=>$items) {
+			for ($index = count($items) - 1; $index >= 0; $index--)
+				$this->removeAtIndexInPriority($index, $priority);
 			unset($this->_d[$priority]);
 		}
 	}
@@ -460,7 +460,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 
 	/**
@@ -469,7 +469,7 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->flattenPriorities(),true))===false)
+		if (($index = array_search($item, $this->flattenPriorities(), true)) === false)
 			return -1;
 		else
 			return $index;
@@ -484,18 +484,18 @@ 
 	 *   if withindex is true, an array is returned of [0 => $priority, 1 => $priorityIndex, 2 => flattenedIndex,
 	 * 'priority' => $priority, 'index' => $priorityIndex, 'absindex' => flattenedIndex]
 	 */
-	public function priorityOf($item,$withindex = false)
+	public function priorityOf($item, $withindex = false)
 	{
 		$this->sortPriorities();
 
 		$absindex = 0;
-		foreach($this->_d as $priority=>$items) {
-			if(($index=array_search($item,$items,true))!==false) {
-				$absindex+=$index;
-				return $withindex?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+		foreach ($this->_d as $priority=>$items) {
+			if (($index = array_search($item, $items, true)) !== false) {
+				$absindex += $index;
+				return $withindex ? array($priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex) : $priority;
 			} else
-				$absindex+=count($items);
+				$absindex += count($items);
 		}
 
 		return false;
@@ -510,19 +510,19 @@ 
 	 *   if withindex is true, an array is returned of [0 => $priority, 1 => $priorityIndex, 2 => flattenedIndex,
 	 * 'priority' => $priority, 'index' => $priorityIndex, 'absindex' => flattenedIndex]
 	 */
-	public function priorityAt($index,$withindex = false)
+	public function priorityAt($index, $withindex = false)
 	{
-		if($index<0||$index>=$this->getCount())
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+		if ($index < 0 || $index >= $this->getCount())
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 
-		$absindex=$index;
+		$absindex = $index;
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items) {
-			if($index>=($c=count($items)))
-				$index-=$c;
+		foreach ($this->_d as $priority=>$items) {
+			if ($index >= ($c = count($items)))
+				$index -= $c;
 			else
-				return $withindex?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+				return $withindex ? array($priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex) : $priority;
 		}
 		return false;
 	}
@@ -537,13 +537,13 @@ 
 	 */
 	public function insertBefore($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority=$this->priorityOf($indexitem,true))===false)
+		if (($priority = $this->priorityOf($indexitem, true)) === false)
 			throw new TInvalidDataValueException('list_item_inexistent');
 
-		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 
 		return $priority[2];
 	}
@@ -558,15 +558,15 @@ 
 	 */
 	public function insertAfter($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 
-		if(($priority=$this->priorityOf($indexitem,true))===false)
+		if (($priority = $this->priorityOf($indexitem, true)) === false)
 			throw new TInvalidDataValueException('list_item_inexistent');
 
-		$this->insertAtIndexInPriority($item,$priority[1]+1,$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1] + 1, $priority[0]);
 
-		return $priority[2]+1;
+		return $priority[2] + 1;
 	}
 
 	/**
@@ -593,15 +593,15 @@ 
 	 * @return array the array of priorities keys with values of arrays of items that are below a specified priority.
 	 *  The priorities are sorted so important priorities, lower numerics, are first.
 	 */
-	public function toArrayBelowPriority($priority,$inclusive=false)
+	public function toArrayBelowPriority($priority, $inclusive = false)
 	{
 		$this->sortPriorities();
-		$items=array();
-		foreach($this->_d as $itemspriority=>$itemsatpriority)
+		$items = array();
+		foreach ($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
+			if ((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items=array_merge($items,$itemsatpriority);
+			$items = array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -613,15 +613,15 @@ 
 	 * @return array the array of priorities keys with values of arrays of items that are above a specified priority.
 	 *  The priorities are sorted so important priorities, lower numerics, are first.
 	 */
-	public function toArrayAbovePriority($priority,$inclusive=true)
+	public function toArrayAbovePriority($priority, $inclusive = true)
 	{
 		$this->sortPriorities();
-		$items=array();
-		foreach($this->_d as $itemspriority=>$itemsatpriority)
+		$items = array();
+		foreach ($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
+			if ((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items=array_merge($items,$itemsatpriority);
+			$items = array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -635,21 +635,21 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if($data instanceof TPriorityList)
+		if ($data instanceof TPriorityList)
 		{
-			if($this->getCount()>0)
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data->getPriorities() as $priority)
+			foreach ($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,$index,$priority);
+				foreach ($data->itemsAtPriority($priority) as $index=>$item)
+					$this->insertAtIndexInPriority($item, $index, $priority);
 			}
-		} else if(is_array($data)||$data instanceof Traversable) {
-			if($this->getCount()>0)
+		} else if (is_array($data) || $data instanceof Traversable) {
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data as $key=>$item)
+			foreach ($data as $key=>$item)
 				$this->add($item);
-		} else if($data!==null)
+		} else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -663,21 +663,21 @@ 
 	 */
 	public function mergeWith($data)
 	{
-		if($data instanceof TPriorityList)
+		if ($data instanceof TPriorityList)
 		{
-			foreach($data->getPriorities() as $priority)
+			foreach ($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,false,$priority);
+				foreach ($data->itemsAtPriority($priority) as $index=>$item)
+					$this->insertAtIndexInPriority($item, false, $priority);
 			}
 		}
-		else if(is_array($data)||$data instanceof Traversable)
+		else if (is_array($data) || $data instanceof Traversable)
 		{
-			foreach($data as $priority=>$item)
+			foreach ($data as $priority=>$item)
 				$this->add($item);
 
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -689,7 +689,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0&&$offset<$this->getCount());
+		return ($offset >= 0 && $offset < $this->getCount());
 	}
 
 	/**
@@ -715,18 +715,18 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		if($offset===null)
+		if ($offset === null)
 			return $this->add($item);
-		if($offset===$this->getCount()) {
-			$priority=$this->priorityAt($offset-1,true);
+		if ($offset === $this->getCount()) {
+			$priority = $this->priorityAt($offset - 1, true);
 			$priority[1]++;
 		} else {
-			$priority=$this->priorityAt($offset,true);
-			$this->removeAtIndexInPriority($priority[1],$priority[0]);
+			$priority = $this->priorityAt($offset, true);
+			$this->removeAtIndexInPriority($priority[1], $priority[0]);
 		}
-		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 	}
 
 	/**

framework/Collections/TAttributeCollection.php

Spacing +11 added lines, -11 removed lines

@@ -42,7 +42,7 @@ 
  */
 class TAttributeCollection extends TMap
 {
-	private $_caseSensitive=false;
+	private $_caseSensitive = false;
 
 	/**
 	 * Returns an array with the names of all variables of this object that should NOT be serialized
@@ -53,7 +53,7 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_caseSensitive===false)
+		if ($this->_caseSensitive === false)
 			$exprops[] = "\0TAttributeCollection\0_caseSensitive";
 	}
 
@@ -67,7 +67,7 @@ 
 	 */
 	public function __get($name)
 	{
-		return $this->contains($name)?$this->itemAt($name):parent::__get($name);
+		return $this->contains($name) ? $this->itemAt($name) : parent::__get($name);
 	}
 
 	/**
@@ -78,9 +78,9 @@ 
 	 * @param mixed the property value or event handler
 	 * @throws TInvalidOperationException If the property is not defined or read-only.
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		$this->add($name,$value);
+		$this->add($name, $value);
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	public function setCaseSensitive($value)
 	{
-		$this->_caseSensitive=TPropertyValue::ensureBoolean($value);
+		$this->_caseSensitive = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function itemAt($key)
 	{
-		return parent::itemAt($this->_caseSensitive?$key:strtolower($key));
+		return parent::itemAt($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 
@@ -117,9 +117,9 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		parent::add($this->_caseSensitive?$key:strtolower($key),$value);
+		parent::add($this->_caseSensitive ? $key : strtolower($key), $value);
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 */
 	public function remove($key)
 	{
-		return parent::remove($this->_caseSensitive?$key:strtolower($key));
+		return parent::remove($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return parent::contains($this->_caseSensitive?$key:strtolower($key));
+		return parent::contains($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**

framework/Collections/TDummyDataSource.php

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	public function __construct($count)
 	{
-		$this->_count=$count;
+		$this->_count = $count;
 	}
 
 	/**
@@ -88,8 +88,8 @@ 
 	 */
 	public function __construct($count)
 	{
-		$this->_count=$count;
-		$this->_index=0;
+		$this->_count = $count;
+		$this->_index = 0;
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_index=0;
+		$this->_index = 0;
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_index<$this->_count;
+		return $this->_index < $this->_count;
 	}
 }
 

framework/TModule.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	 */
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 }
 

framework/3rdParty/WsdlGen/WsdlOperation.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	private $outputMessage;
 
-	public function __construct($name, $doc='')
+	public function __construct($name, $doc = '')
 	{
 		$this->operationName = $name;
 		$this->documentation = $doc;
@@ -87,9 +87,9 @@ 
 
 		$documentation = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/', 'wsdl:documentation', htmlentities($this->documentation));
 		$input = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/', 'wsdl:input');
-		$input->setAttribute('message', 'tns:'.$this->inputMessage->getName());
+		$input->setAttribute('message', 'tns:' . $this->inputMessage->getName());
 		$output = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/', 'wsdl:output');
-		$output->setAttribute('message', 'tns:'.$this->outputMessage->getName());
+		$output->setAttribute('message', 'tns:' . $this->outputMessage->getName());
 
 		$operation->appendChild($documentation);
 		$operation->appendChild($input);
@@ -106,14 +106,14 @@ 
 	 * @param 	string			$namespace	The namespace this binding is in.
 	 * @return 	DomElement					The dom element representing this binding.
 	 */
-	public function getBindingOperation(DomDocument $dom, $namespace, $style='rpc')
+	public function getBindingOperation(DomDocument $dom, $namespace, $style = 'rpc')
 	{
 		$operation = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/', 'wsdl:operation');
 		$operation->setAttribute('name', $this->operationName);
 
 		$soapOperation = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/soap/', 'soap:operation');
 		$method = $this->operationName;
-		$soapOperation->setAttribute('soapAction', $namespace.'#'.$method);
+		$soapOperation->setAttribute('soapAction', $namespace . '#' . $method);
 		$soapOperation->setAttribute('style', $style);
 
 		$input = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/', 'wsdl:input');

framework/3rdParty/WsdlGen/WsdlGenerator.php

Spacing +26 added lines, -26 removed lines

@@ -14,9 +14,9 @@ 
  * @package System.Web.Services.SOAP
  */
 
-require_once(dirname(__FILE__).'/Wsdl.php');
-require_once(dirname(__FILE__).'/WsdlMessage.php');
-require_once(dirname(__FILE__).'/WsdlOperation.php');
+require_once(dirname(__FILE__) . '/Wsdl.php');
+require_once(dirname(__FILE__) . '/WsdlMessage.php');
+require_once(dirname(__FILE__) . '/WsdlOperation.php');
 
 /**
  * Generator for the wsdl.
@@ -91,7 +91,7 @@ 
 	 * @param string $encoding character encoding.
 	 * @return 	void
 	 */
-	public function generateWsdl($className, $serviceUri='',$encoding='')
+	public function generateWsdl($className, $serviceUri = '', $encoding = '')
 	{
 		$this->wsdlDocument = new Wsdl($className, $serviceUri, $encoding);
 
@@ -105,7 +105,7 @@ 
 			}
 		}
 
-		foreach($this->types as $type => $elements) {
+		foreach ($this->types as $type => $elements) {
 			$this->wsdlDocument->addComplexType($type, $elements);
 		}
 
@@ -118,10 +118,10 @@ 
 	 * @param 		string		$serviceUri		The URI of the service that handles this WSDL
 	 * @param string $encoding character encoding.
 	 */
-	public static function generate($className, $serviceUri='', $encoding='')
+	public static function generate($className, $serviceUri = '', $encoding = '')
 	{
 		$generator = WsdlGenerator::getInstance();
-		$generator->generateWsdl($className, $serviceUri,$encoding);
+		$generator->generateWsdl($className, $serviceUri, $encoding);
 		//header('Content-type: text/xml');
 		return $generator->getWsdl();
 		//exit();
@@ -177,7 +177,7 @@ 
 					$methodDoc .= trim($line);
 				}
 				else if (!$gotParams) {
-					$params[count($params)-1]['desc'] .= trim($line);
+					$params[count($params) - 1]['desc'] .= trim($line);
 				}
 				else {
 					if ($line == '*/') continue;
@@ -189,8 +189,8 @@ 
 		$methodName = $method->getName();
 		$operation = new WsdlOperation($methodName, $methodDoc);
 
-		$operation->setInputMessage(new WsdlMessage($methodName.'Request', $params));
-		$operation->setOutputMessage(new WsdlMessage($methodName.'Response', array($return)));
+		$operation->setInputMessage(new WsdlMessage($methodName . 'Request', $params));
+		$operation->setOutputMessage(new WsdlMessage($methodName . 'Response', array($return)));
 
 		$this->wsdlDocument->addOperation($operation);
 
@@ -244,7 +244,7 @@ 
              case 'void':
                  return '';
              default:
-             	 if(strpos($type, '[]'))  // if it is an array
+             	 if (strpos($type, '[]'))  // if it is an array
              	 {
              	 	$className = substr($type, 0, strlen($type) - 2);
              	 	$type = $className . 'Array';
@@ -253,7 +253,7 @@ 
              	 }
              	 else
              	 {
-             	 	 if(!isset($this->types[$type]))
+             	 	 if (!isset($this->types[$type]))
 	             		$this->extractClassProperties($type);
              	 }
                  return 'tns:' . $type;
@@ -276,28 +276,28 @@ 
 		 */
 		$reflection = new ReflectionClass($className);
 		$properties = $reflection->getProperties();
-		foreach($properties as $property)
+		foreach ($properties as $property)
 		{
 			$comment = $property->getDocComment();
-			if(strpos($comment, '@soapproperty') !== false)
+			if (strpos($comment, '@soapproperty') !== false)
 			{
-				if(preg_match('/@var\s+([\w\.]+(\[\s*\])?)\s*?\$(.*)$/mi',$comment,$matches))
+				if (preg_match('/@var\s+([\w\.]+(\[\s*\])?)\s*?\$(.*)$/mi', $comment, $matches))
 				{
 					// support nillable, minOccurs, maxOccurs attributes
-					$nillable=$minOccurs=$maxOccurs=false;
-					if(preg_match('/{(.+)}/',$matches[3],$attr))
+					$nillable = $minOccurs = $maxOccurs = false;
+					if (preg_match('/{(.+)}/', $matches[3], $attr))
 					{
-						$matches[3]=str_replace($attr[0],'',$matches[3]);
-						if(preg_match_all('/((\w+)\s*=\s*(\w+))/mi',$attr[1],$attr))
+						$matches[3] = str_replace($attr[0], '', $matches[3]);
+						if (preg_match_all('/((\w+)\s*=\s*(\w+))/mi', $attr[1], $attr))
 						{
-							foreach($attr[2] as $id=>$prop)
+							foreach ($attr[2] as $id=>$prop)
 							{
-								if(strcasecmp($prop,'nillable')===0)
-									$nillable=$attr[3][$id] ? 'true' : 'false';
-								elseif(strcasecmp($prop,'minOccurs')===0)
-									$minOccurs=(int)$attr[3][$id];
-								elseif(strcasecmp($prop,'maxOccurs')===0)
-									$maxOccurs=(int)$attr[3][$id];
+								if (strcasecmp($prop, 'nillable') === 0)
+									$nillable = $attr[3][$id] ? 'true' : 'false';
+								elseif (strcasecmp($prop, 'minOccurs') === 0)
+									$minOccurs = (int) $attr[3][$id];
+								elseif (strcasecmp($prop, 'maxOccurs') === 0)
+									$maxOccurs = (int) $attr[3][$id];
 							}
 						}
 					}

framework/3rdParty/WsdlGen/Wsdl.php

Spacing +29 added lines, -29 removed lines

@@ -48,7 +48,7 @@ 
 	 * A collection of SOAP operations
 	 * @var 	array
 	 */
-	private $operations=array();
+	private $operations = array();
 
 	/**
 	 * Wsdl DOMDocument that's generated.
@@ -63,7 +63,7 @@ 
 	/**
 	 * The target namespace variable?
 	 */
-	private $targetNamespace ='';
+	private $targetNamespace = '';
 
 	/**
 	 * The binding style (default at the moment)
@@ -75,7 +75,7 @@ 
 	 */
 	private $bindingTransport = 'http://schemas.xmlsoap.org/soap/http';
 
-	private $_encoding='';
+	private $_encoding = '';
 
 	private static $_primitiveTypes = array('string', 'int', 'float', 'boolean', 'date', 'time', 'dateTime');
 
@@ -85,15 +85,15 @@ 
 	 * @param 	string		$serviceUri		The URI of the service that handles this WSDL
 	 * @param string character encoding
 	 */
-	public function __construct($name, $serviceUri='', $encoding='')
+	public function __construct($name, $serviceUri = '', $encoding = '')
 	{
 		$this->_encoding = $encoding;
 		$this->serviceName = $name;
-		$protocol=(isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!=='off'))?'https://':'http://';
-		if ($serviceUri === '') $serviceUri = $protocol.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'];
+		$protocol = (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] !== 'off')) ? 'https://' : 'http://';
+		if ($serviceUri === '') $serviceUri = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
 		$this->serviceUri = str_replace('&', '&', $serviceUri);
 		$this->types = new ArrayObject();
-		$this->targetNamespace = 'urn:'.$name.'wsdl';
+		$this->targetNamespace = 'urn:' . $name . 'wsdl';
 	}
 
 	public function getWsdl()
@@ -107,12 +107,12 @@ 
 	 */
 	protected function buildWsdl()
 	{
-		$encoding = $this->_encoding==='' ? '' : 'encoding="'.$this->_encoding.'"';
+		$encoding = $this->_encoding === '' ? '' : 'encoding="' . $this->_encoding . '"';
 
-		$xml = '<?xml version="1.0" '.$encoding.'?>
-                 <definitions name="'.$this->serviceName.'" targetNamespace="'.$this->targetNamespace.'"
+		$xml = '<?xml version="1.0" ' . $encoding . '?>
+                 <definitions name="'.$this->serviceName . '" targetNamespace="' . $this->targetNamespace . '"
                      xmlns="http://schemas.xmlsoap.org/wsdl/"
-                     xmlns:tns="'.$this->targetNamespace.'"
+                     xmlns:tns="'.$this->targetNamespace . '"
                      xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                      xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 					 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
@@ -142,37 +142,37 @@ 
 		$types = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/', 'wsdl:types');
 		$schema = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:schema');
 		$schema->setAttribute('targetNamespace', $this->targetNamespace);
-		foreach($this->types as $type => $elements)
+		foreach ($this->types as $type => $elements)
 		{
 			$complexType = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:complexType');
 			$complexType->setAttribute('name', $type);
-			if(substr($type, strlen($type) - 5, 5) == 'Array')  // if it's an array
+			if (substr($type, strlen($type) - 5, 5) == 'Array')  // if it's an array
 			{
 				$sequence = $dom->createElement("xsd:sequence");
 
 				$singularType = substr($type, 0, strlen($type) - 5);
 				$e = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:element');
 				$e->setAttribute('name', $singularType);
-				$e->setAttribute('type', sprintf('tns:%s',$singularType));
-				$e->setAttribute('minOccurs','0');
-				$e->setAttribute('maxOccurs','unbounded');
+				$e->setAttribute('type', sprintf('tns:%s', $singularType));
+				$e->setAttribute('minOccurs', '0');
+				$e->setAttribute('maxOccurs', 'unbounded');
 				$sequence->appendChild($e);
 				$complexType->appendChild($sequence);
 			}
 			else
 			{
 				$all = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:all');
-				foreach($elements as $elem)
+				foreach ($elements as $elem)
 				{
 					$e = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:element');
 					$e->setAttribute('name', $elem['name']);
 					$e->setAttribute('type', $elem['type']);
-					if($elem['minOc']!==false)
-						$e->setAttribute('minOccurs',$elem['minOc']);
-					if($elem['maxOc']!==false)
-						$e->setAttribute('maxOccurs',$elem['maxOc']);
-					if($elem['nil']!==false)
-						$e->setAttribute('nillable',$elem['nil']);
+					if ($elem['minOc'] !== false)
+						$e->setAttribute('minOccurs', $elem['minOc']);
+					if ($elem['maxOc'] !== false)
+						$e->setAttribute('maxOccurs', $elem['maxOc']);
+					if ($elem['nil'] !== false)
+						$e->setAttribute('nillable', $elem['nil']);
 					$all->appendChild($e);
 				}
 				$complexType->appendChild($all);
@@ -211,7 +211,7 @@ 
 	protected function addPortTypes(DOMDocument $dom)
 	{
 		$portType = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/', 'wsdl:portType');
-		$portType->setAttribute('name', $this->serviceName.'PortType');
+		$portType->setAttribute('name', $this->serviceName . 'PortType');
 
 		$this->definitions->appendChild($portType);
 		foreach ($this->operations as $operation) {
@@ -227,8 +227,8 @@ 
 	protected function addBindings(DOMDocument $dom)
 	{
 		$binding = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/', 'wsdl:binding');
-		$binding->setAttribute('name', $this->serviceName.'Binding');
-		$binding->setAttribute('type', 'tns:'.$this->serviceName.'PortType');
+		$binding->setAttribute('name', $this->serviceName . 'Binding');
+		$binding->setAttribute('type', 'tns:' . $this->serviceName . 'PortType');
 
 		$soapBinding = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/soap/', 'soap:binding');
 		$soapBinding->setAttribute('style', $this->bindingStyle);
@@ -250,11 +250,11 @@ 
 	protected function addService(DomDocument $dom)
 	{
 		$service = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/', 'wsdl:service');
-		$service->setAttribute('name', $this->serviceName.'Service');
+		$service->setAttribute('name', $this->serviceName . 'Service');
 
 		$port = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/', 'wsdl:port');
-		$port->setAttribute('name', $this->serviceName.'Port');
-		$port->setAttribute('binding', 'tns:'.$this->serviceName.'Binding');
+		$port->setAttribute('name', $this->serviceName . 'Port');
+		$port->setAttribute('binding', 'tns:' . $this->serviceName . 'Binding');
 
 		$soapAddress = $dom->createElementNS('http://schemas.xmlsoap.org/wsdl/soap/', 'soap:address');
 		$soapAddress->setAttribute('location', $this->serviceUri);

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

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;
       }
 

framework/3rdParty/FirePHPCore/fb.php

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);
   }