pradosoft / prado

framework/Web/UI/WebControls/TMultiView.php

Braces +3 added lines, -6 removed lines

@@ -97,8 +97,7 @@ 
 			$this->_cachedActiveViewIndex=-1;
 			if($index>=0)
 				$this->activateView($views->itemAt($index),true);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
 	}
 
@@ -153,8 +152,7 @@ 
 					$view->onActivate(null);
 					$this->onActiveViewChanged(null);
 				}
-			}
-			else if($v->getActive())
+			} else if($v->getActive())
 			{
 				$v->setActive(false);
 				if($triggerEvent)
@@ -232,8 +230,7 @@ 
 					{
 						$this->setActiveView($view);
 						return true;
-					}
-					else
+					} else
 						throw new TInvalidDataValueException('multiview_viewid_invalid', $viewID);
 				case self::CMD_SWITCHVIEWINDEX:
 					$index=TPropertyValue::ensureInteger($param->getCommandParameter());

Spacing +23 added lines, -23 removed lines

@@ -80,10 +80,10 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		if($this->_cachedActiveViewIndex>-1)
+		if($this->_cachedActiveViewIndex > -1)
 			return $this->_cachedActiveViewIndex;
 		else
-			return $this->getControlState('ActiveViewIndex',-1);
+			return $this->getControlState('ActiveViewIndex', -1);
 	}
 
 	/**
@@ -92,21 +92,21 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		if(($index=TPropertyValue::ensureInteger($value))<0)
+		if(($index=TPropertyValue::ensureInteger($value)) < 0)
 			$index=-1;
 		$views=$this->getViews();
 		$count=$views->getCount();
-		if($count===0 && $this->getControlStage()<TControl::CS_CHILD_INITIALIZED)
+		if($count===0 && $this->getControlStage() < TControl::CS_CHILD_INITIALIZED)
 			$this->_cachedActiveViewIndex=$index;
-		else if($index<$count)
+		else if($index < $count)
 		{
-			$this->setControlState('ActiveViewIndex',$index,-1);
+			$this->setControlState('ActiveViewIndex', $index, -1);
 			$this->_cachedActiveViewIndex=-1;
-			if($index>=0)
-				$this->activateView($views->itemAt($index),true);
+			if($index >= 0)
+				$this->activateView($views->itemAt($index), true);
 		}
 		else
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
+			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
 	}
 
 	/**
@@ -117,13 +117,13 @@ 
 	{
 		$index=$this->getActiveViewIndex();
 		$views=$this->getViews();
-		if($index>=$views->getCount())
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
-		if($index<0)
+		if($index >= $views->getCount())
+			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
+		if($index < 0)
 			return null;
 		$view=$views->itemAt($index);
 		if(!$view->getActive())
-			$this->activateView($view,false);
+			$this->activateView($view, false);
 		return $view;
 	}
 
@@ -133,7 +133,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if(($index=$this->getViews()->indexOf($view))>=0)
+		if(($index=$this->getViews()->indexOf($view)) >= 0)
 			$this->setActiveViewIndex($index);
 		else
 			throw new TInvalidOperationException('multiview_view_inexistent');
@@ -145,11 +145,11 @@ 
 	 * @param TView the view to be activated
 	 * @param boolean whether to trigger OnActiveViewChanged event.
 	 */
-	protected function activateView($view,$triggerViewChangedEvent=true)
+	protected function activateView($view, $triggerViewChangedEvent=true)
 	{
 		if($view->getActive())
 			return;
-		$triggerEvent=$triggerViewChangedEvent && ($this->getControlStage()>=\Prado\Web\UI\TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
+		$triggerEvent=$triggerViewChangedEvent && ($this->getControlStage() >= \Prado\Web\UI\TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
 		foreach($this->getViews() as $v)
 		{
 			if($v===$view)
@@ -196,7 +196,7 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if($this->_cachedActiveViewIndex>=0)
+		if($this->_cachedActiveViewIndex >= 0)
 			$this->setActiveViewIndex($this->_cachedActiveViewIndex);
 	}
 
@@ -207,7 +207,7 @@ 
 	 */
 	public function onActiveViewChanged($param)
 	{
-		$this->raiseEvent('OnActiveViewChanged',$this,$param);
+		$this->raiseEvent('OnActiveViewChanged', $this, $param);
 	}
 
 	/**
@@ -217,21 +217,21 @@ 
 	 * @param mixed event parameter
 	 * @return boolean whether this event is handled
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if(!$this->_ignoreBubbleEvents && ($param instanceof \Prado\Web\UI\TCommandEventParameter))
 		{
 			switch($param->getCommandName())
 			{
 				case self::CMD_NEXTVIEW:
-					if(($index=$this->getActiveViewIndex())<$this->getViews()->getCount()-1)
-						$this->setActiveViewIndex($index+1);
+					if(($index=$this->getActiveViewIndex()) < $this->getViews()->getCount() - 1)
+						$this->setActiveViewIndex($index + 1);
 					else
 						$this->setActiveViewIndex(-1);
 					return true;
 				case self::CMD_PREVIOUSVIEW:
-					if(($index=$this->getActiveViewIndex())>=0)
-						$this->setActiveViewIndex($index-1);
+					if(($index=$this->getActiveViewIndex()) >= 0)
+						$this->setActiveViewIndex($index - 1);
 					return true;
 				case self::CMD_SWITCHVIEWID:
 					$view=$this->findControl($viewID=$param->getCommandParameter());

framework/Web/UI/WebControls/TEditCommandColumn.php

Braces +2 added lines, -4 removed lines

@@ -211,8 +211,7 @@ 
 			$button=$this->createButton('Edit',$this->getEditText(),false,'');
 			$cell->getControls()->add($button);
 			$cell->registerObject('EditButton',$button);
-		}
-		else if($itemType===TListItemType::EditItem)
+		} else if($itemType===TListItemType::EditItem)
 		{
 			$controls=$cell->getControls();
 			$button=$this->createButton('Update',$this->getUpdateText(),$this->getCausesValidation(),$this->getValidationGroup());
@@ -222,8 +221,7 @@ 
 			$button=$this->createButton('Cancel',$this->getCancelText(),false,'');
 			$controls->add($button);
 			$cell->registerObject('CancelButton',$button);
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 

Doc Comments +4 added lines

@@ -233,6 +233,10 @@
 	 * @param string button caption
 	 * @param boolean whether the button should cause validation
 	 * @param string the validation group that the button belongs to
+	 * @param string $commandName
+	 * @param string $text
+	 * @param boolean $causesValidation
+	 * @param string $validationGroup
 	 * @return mixed the newly created button.
 	 */
 	protected function createButton($commandName,$text,$causesValidation,$validationGroup)

Spacing +32 added lines, -32 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->getViewState('ButtonType',TButtonColumnType::LinkButton);
+		return $this->getViewState('ButtonType', TButtonColumnType::LinkButton);
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->setViewState('ButtonType',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TButtonColumnType'),TButtonColumnType::LinkButton);
+		$this->setViewState('ButtonType', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TButtonColumnType'), TButtonColumnType::LinkButton);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function getEditText()
 	{
-		return $this->getViewState('EditText','Edit');
+		return $this->getViewState('EditText', 'Edit');
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function setEditText($value)
 	{
-		$this->setViewState('EditText',$value,'Edit');
+		$this->setViewState('EditText', $value, 'Edit');
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function getEditImageUrl()
 	{
-		return $this->getViewState('EditImageUrl','');
+		return $this->getViewState('EditImageUrl', '');
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setEditImageUrl($value)
 	{
-		$this->setViewState('EditImageUrl',$value,'');
+		$this->setViewState('EditImageUrl', $value, '');
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function getUpdateText()
 	{
-		return $this->getViewState('UpdateText','Update');
+		return $this->getViewState('UpdateText', 'Update');
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setUpdateText($value)
 	{
-		$this->setViewState('UpdateText',$value,'Update');
+		$this->setViewState('UpdateText', $value, 'Update');
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function getUpdateImageUrl()
 	{
-		return $this->getViewState('UpdateImageUrl','');
+		return $this->getViewState('UpdateImageUrl', '');
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	public function setUpdateImageUrl($value)
 	{
-		$this->setViewState('UpdateImageUrl',$value,'');
+		$this->setViewState('UpdateImageUrl', $value, '');
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function getCancelText()
 	{
-		return $this->getViewState('CancelText','Cancel');
+		return $this->getViewState('CancelText', 'Cancel');
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setCancelText($value)
 	{
-		$this->setViewState('CancelText',$value,'Cancel');
+		$this->setViewState('CancelText', $value, 'Cancel');
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public function getCancelImageUrl()
 	{
-		return $this->getViewState('CancelImageUrl','');
+		return $this->getViewState('CancelImageUrl', '');
 	}
 
 	/**
@@ -159,7 +159,7 @@ 
 	 */
 	public function setCancelImageUrl($value)
 	{
-		$this->setViewState('CancelImageUrl',$value,'');
+		$this->setViewState('CancelImageUrl', $value, '');
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -183,7 +183,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -191,7 +191,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -203,27 +203,27 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem)
 		{
-			$button=$this->createButton('Edit',$this->getEditText(),false,'');
+			$button=$this->createButton('Edit', $this->getEditText(), false, '');
 			$cell->getControls()->add($button);
-			$cell->registerObject('EditButton',$button);
+			$cell->registerObject('EditButton', $button);
 		}
 		else if($itemType===TListItemType::EditItem)
 		{
 			$controls=$cell->getControls();
-			$button=$this->createButton('Update',$this->getUpdateText(),$this->getCausesValidation(),$this->getValidationGroup());
+			$button=$this->createButton('Update', $this->getUpdateText(), $this->getCausesValidation(), $this->getValidationGroup());
 			$controls->add($button);
-			$cell->registerObject('UpdateButton',$button);
+			$cell->registerObject('UpdateButton', $button);
 			$controls->add(' ');
-			$button=$this->createButton('Cancel',$this->getCancelText(),false,'');
+			$button=$this->createButton('Cancel', $this->getCancelText(), false, '');
 			$controls->add($button);
-			$cell->registerObject('CancelButton',$button);
+			$cell->registerObject('CancelButton', $button);
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -235,18 +235,18 @@ 
 	 * @param string the validation group that the button belongs to
 	 * @return mixed the newly created button.
 	 */
-	protected function createButton($commandName,$text,$causesValidation,$validationGroup)
+	protected function createButton($commandName, $text, $causesValidation, $validationGroup)
 	{
 		if($this->getButtonType()===TButtonColumnType::LinkButton)
-			$button= new TLinkButton;
+			$button=new TLinkButton;
 		else if($this->getButtonType()===TButtonColumnType::PushButton)
-			$button= new TButton;
+			$button=new TButton;
 		else	// image buttons
 		{
-			$button= new TImageButton;
-			if(strcasecmp($commandName,'Update')===0)
+			$button=new TImageButton;
+			if(strcasecmp($commandName, 'Update')===0)
 				$url=$this->getUpdateImageUrl();
-			else if(strcasecmp($commandName,'Cancel')===0)
+			else if(strcasecmp($commandName, 'Cancel')===0)
 				$url=$this->getCancelImageUrl();
 			else
 				$url=$this->getEditImageUrl();

framework/Web/UI/WebControls/TImageButton.php

Braces +2 added lines, -4 removed lines

@@ -106,8 +106,7 @@ 
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
-		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} else if($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
 		parent::addAttributesToRender($writer);
 	}
@@ -141,8 +140,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +28 added lines, -28 removed lines

@@ -78,7 +78,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -98,16 +98,16 @@ 
 	{
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
-		$writer->addAttribute('type','image');
+		$writer->addAttribute('type', 'image');
 		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
+			$writer->addAttribute('name', $uniqueID);
 		if($this->getEnabled(true))
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
 		}
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -116,9 +116,9 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 		if($this->getCausesValidation())
 		{
 			$group=$this->getValidationGroup();
-			return $this->getPage()->getValidators($group)->getCount()>0;
+			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
 			return false;
@@ -150,7 +150,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -176,10 +176,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['EventTarget']=$this->getUniqueID();
 
 		return $options;
 	}
@@ -191,7 +191,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		$uid=$this->getUniqueID();
 		if(isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
@@ -222,7 +222,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -234,8 +234,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 
 	/**
@@ -251,8 +251,8 @@ 
 	{
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TImageClickEventParameter($this->_x,$this->_y));
-		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
+		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -286,7 +286,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -294,7 +294,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -302,7 +302,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -310,7 +310,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -326,7 +326,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**

Doc Comments +2 added lines

@@ -219,6 +219,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handler can be invoked.
 	 * @param TImageClickEventParameter event parameter to be passed to the event handlers
+	 * @param TImageClickEventParameter $param
 	 */
 	public function onClick($param)
 	{
@@ -231,6 +232,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param \Prado\Web\UI\TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param \Prado\Web\UI\TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{

framework/Web/UI/JuiControls/TJuiAutoComplete.php

Braces +2 added lines, -4 removed lines

@@ -235,14 +235,12 @@
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
-			}
-			else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			} else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
-		}
-		else if($this->getAutoPostBack())
+		} else if($this->getAutoPostBack())
 			parent::raiseCallbackEvent($param);
 	}
 

Doc Comments +2 added lines

@@ -260,6 +260,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TJuiAutoCompleteEventParameter $param
 	 */
 	public function onSuggest($param)
 	{
@@ -272,6 +273,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TJuiAutoCompleteEventParameter $param
 	 */
 	public function onSuggestionSelected($param)
 	{

Spacing +30 added lines, -30 removed lines

@@ -131,7 +131,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -212,7 +212,7 @@ 
 	 */
 	public function getMinChars()
 	{
-		return $this->getViewState('minChars','');
+		return $this->getViewState('minChars', '');
 	}
 
 	/**
@@ -236,17 +236,17 @@ 
 	 */
  	public function raiseCallbackEvent($param)
 	{
-		$token = $param->getCallbackParameter();
-		if(is_array($token) && count($token) == 2)
+		$token=$param->getCallbackParameter();
+		if(is_array($token) && count($token)==2)
 		{
-			if($token[1] === '__TJuiAutoComplete_onSuggest__')
+			if($token[1]==='__TJuiAutoComplete_onSuggest__')
 			{
-				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
+				$parameter=new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
 			}
-			else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			else if($token[1]==='__TJuiAutoComplete_onSuggestionSelected__')
 			{
-				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
+				$parameter=new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
 		}
@@ -303,7 +303,7 @@ 
 	public function getResultPanel()
 	{
 		if($this->_resultPanel===null)
-			$this->_resultPanel = $this->createResultPanel();
+			$this->_resultPanel=$this->createResultPanel();
 		return $this->_resultPanel;
 	}
 
@@ -312,7 +312,7 @@ 
 	 */
 	protected function createResultPanel()
 	{
-		$panel = new TPanel;
+		$panel=new TPanel;
 		$this->getControls()->add($panel);
 		$panel->setID('result');
 		return $panel;
@@ -324,7 +324,7 @@ 
 	public function getSuggestions()
 	{
 		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+			$this->_repeater=$this->createRepeater();
 		return $this->_repeater;
 	}
 
@@ -333,8 +333,8 @@ 
 	 */
 	protected function createRepeater()
 	{
-		$repeater = new TRepeater;
-		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>',null));
+		$repeater=new TRepeater;
+		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>', null));
 		$this->getControls()->add($repeater);
 		return $repeater;
 	}
@@ -376,12 +376,12 @@ 
 		{
 			$data=array();
 			$items=$this->getSuggestions()->getItems();
-			$writer = new TTextWriter;
-			for($i=0; $i<$items->Count; $i++)
+			$writer=new TTextWriter;
+			for($i=0; $i < $items->Count; $i++)
 			{
 				$items->itemAt($i)->render($writer);
 				$item=$writer->flush();
-				$data[]=array( 'id' => $i, 'label' => $item);
+				$data[]=array('id' => $i, 'label' => $item);
 			}
 
 			$this->getResponse()->getAdapter()->setResponseData($data);
@@ -393,25 +393,25 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = $this->getOptions()->toArray();
+		$options=$this->getOptions()->toArray();
 
-		if(strlen($separator = $this->getSeparator()))
-			$options['Separators'] = $separator;
+		if(strlen($separator=$this->getSeparator()))
+			$options['Separators']=$separator;
 
 		if($this->getAutoPostBack())
 		{
-			$options = array_merge($options,parent::getPostBackOptions());
-			$options['AutoPostBack'] = true;
+			$options=array_merge($options, parent::getPostBackOptions());
+			$options['AutoPostBack']=true;
 		}
-		if(strlen($textCssClass = $this->getTextCssClass()))
-			$options['textCssClass'] = $textCssClass;
-		$options['minLength'] = $this->getMinChars();
-		$options['delay'] = $this->getFrequency()*1000.0;
-		$options['appendTo'] = '#'.$this->getResultPanel()->getClientID();
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
+		if(strlen($textCssClass=$this->getTextCssClass()))
+			$options['textCssClass']=$textCssClass;
+		$options['minLength']=$this->getMinChars();
+		$options['delay']=$this->getFrequency() * 1000.0;
+		$options['appendTo']='#'.$this->getResultPanel()->getClientID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
 		return $options;
 	}
 

framework/Web/UI/ActiveControls/TActiveDataList.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
       if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
+    } else {
       $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
     }
   }

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
     parent::setDataSource($value);
     if($this->getActiveControl()->canUpdateClientSide()) {
       $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+      $this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
     }
   }
 
@@ -78,10 +78,10 @@ 
   {
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
     }
     else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+      $this->getPage()->getAdapter()->registerControlToRender($this, $writer);
     }
   }
 
@@ -97,7 +97,7 @@ 
     {
       if($item->ControlToPaginate==$this->ID) {
         $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+        $this->getPage()->getAdapter()->registerControlToRender($item, $writer);
       }
     }
   }

Indentation +27 added lines, -27 removed lines

@@ -34,8 +34,8 @@ 
    */
   public function __construct()
   {
-    parent::__construct();
-    $this->setAdapter(new TActiveControlAdapter($this));
+	parent::__construct();
+	$this->setAdapter(new TActiveControlAdapter($this));
   }
 
   /**
@@ -43,7 +43,7 @@ 
    */
   public function getActiveControl()
   {
-    return $this->getAdapter()->getBaseActiveControl();
+	return $this->getAdapter()->getBaseActiveControl();
   }
 
   /**
@@ -55,11 +55,11 @@ 
    */
   public function setDataSource($value)
   {
-    parent::setDataSource($value);
-    if($this->getActiveControl()->canUpdateClientSide()) {
-      $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
-    }
+	parent::setDataSource($value);
+	if($this->getActiveControl()->canUpdateClientSide()) {
+	  $this->renderPager();
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+	}
   }
 
   /**
@@ -68,7 +68,7 @@ 
    */
   protected function getContainerID()
   {
-    return $this->ClientID.'_Container';
+	return $this->ClientID.'_Container';
   }
 
   /**
@@ -79,13 +79,13 @@ 
    */
   public function render($writer)
   {
-    if($this->getHasPreRendered()) {
-      $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
-    }
+	if($this->getHasPreRendered()) {
+	  $this->renderDataList($writer);
+	  if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+	}
+	else {
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+	}
   }
 
   /**
@@ -95,14 +95,14 @@ 
    */
   private function renderPager()
   {
-    $pager=$this->getPage()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false);
-    foreach($pager as $item)
-    {
-      if($item->ControlToPaginate==$this->ID) {
-        $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
-      }
-    }
+	$pager=$this->getPage()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false);
+	foreach($pager as $item)
+	{
+	  if($item->ControlToPaginate==$this->ID) {
+		$writer=$this->getResponse()->createHtmlWriter();
+		$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+	  }
+	}
   }
 
   /**
@@ -112,8 +112,8 @@ 
    */
   private function renderDataList($writer)
   {
-    $writer->write('<span id="'.$this->getContainerID().'">');
-    parent::render($writer);
-    $writer->write('</span>');
+	$writer->write('<span id="'.$this->getContainerID().'">');
+	parent::render($writer);
+	$writer->write('</span>');
   }
 }

framework/Web/UI/ActiveControls/TActiveFileUpload.php

Braces +4 added lines, -8 removed lines

@@ -223,14 +223,12 @@ 
 				// this is the most secure method, file info can't be forged from client side, no matter what
 				$token = md5('TActiveFileUpload::Params::'.$this->ClientID.'::'+rand(1000*1000,9999*1000));
 				$cache->set($token, serialize($params), 5*60); // expire in 5 minutes - the callback should arrive back in seconds, actually
-			}
-		else
+			} else
 		if ($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				// this is a less secure method, file info can be still forged from client side, but only if attacker knows the secret application key
 				$token = urlencode(base64_encode($mgr->encrypt(serialize($params))));
-			}
-		else
+			} else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
 		return $token;
@@ -244,14 +242,12 @@ 
 				assert($v!='');
 				$cache->delete($token); // remove it from cache so it can't be used again and won't take up space either
 				$params = unserialize($v);
-			}
-		else
+			} else
 		if ($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				$v = $mgr->decrypt(base64_decode(urldecode($token)));
 				$params = unserialize($v);
-			}
-		else
+			} else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
 		assert($params instanceof TActiveFileUploadCallbackParams);

Indentation +10 added lines, -10 removed lines

@@ -203,14 +203,14 @@ 
 		if ($key = $cp->targetID == $this->_target->getUniqueID()){
 
 			$params = $this->popParamsByToken($cp->callbackToken);
-      foreach($params->files as $index => $file)
-      {
+	  foreach($params->files as $index => $file)
+	  {
   			$_FILES[$key]['name'][$index] = stripslashes($file['fileName']);
   			$_FILES[$key]['size'][$index] = intval($file['fileSize']);
   			$_FILES[$key]['type'][$index] = $file['fileType'];
   			$_FILES[$key]['error'][$index] = intval($file['errorCode']);
   			$_FILES[$key]['tmp_name'][$index] = $file['localName'];
-      }
+	  }
 			$this->loadPostData($key, null);
 
 			$this->raiseEvent('OnFileUpload', $this, $param);
@@ -281,11 +281,11 @@ 
 		{
 		  $params = new TActiveFileUploadCallbackParams;
 		  foreach ($this->getFiles() as $file) {
-		    $localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
-		    $file->setLocalName($localName);
-		    // tricky workaround to intercept "uploaded file too big" error: real uploads happens in onFileUpload instead
-		    $file->setErrorCode(UPLOAD_ERR_FORM_SIZE);
-		    $params->files[] = $file->toArray();
+			$localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
+			$file->setLocalName($localName);
+			// tricky workaround to intercept "uploaded file too big" error: real uploads happens in onFileUpload instead
+			$file->setErrorCode(UPLOAD_ERR_FORM_SIZE);
+			$params->files[] = $file->toArray();
 		  }
 
 			echo "<script language='Javascript'>
@@ -340,8 +340,8 @@ 
 		if ($this->getPage()->getIsCallback())
 		{
 		  foreach($this->getFiles() as $file)
-		    if($file->getHasFile() && file_exists($file->getLocalName())){
-		      unlink($file->getLocalName());
+			if($file->getHasFile() && file_exists($file->getLocalName())){
+			  unlink($file->getLocalName());
 		  }
 		}
 		parent::onUnload($param);

Spacing +87 added lines, -87 removed lines

@@ -60,7 +60,7 @@ 
  */
 class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallbackEventHandler, INamingContainer
 {
-	const SCRIPT_PATH = 'activefileupload';
+	const SCRIPT_PATH='activefileupload';
 
 	/**
 	 * @var THiddenField a flag to tell which component is doing the callback.
@@ -89,7 +89,7 @@ 
 	 * TActiveControlAdapter. If you override this class, be sure to set the
 	 * adapter appropriately by, for example, by calling this constructor.
 	 */
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
 	}
@@ -101,7 +101,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
@@ -114,14 +114,14 @@ 
 	 */
 	public function onFileUpload($param)
 	{
-		if ($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param == $this->_target->getUniqueID()){
-		  $params = new TActiveFileUploadCallbackParams;
+		if($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param==$this->_target->getUniqueID()) {
+		  $params=new TActiveFileUploadCallbackParams;
 		  // save the files so that they will persist past the end of this return.
-		  foreach ($this->getFiles() as $file) {
-			  $localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
+		  foreach($this->getFiles() as $file) {
+			  $localName=str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()), ''));
 			  $file->saveAs($localName);
 			  $file->setLocalName($localName);
-			  $params->files[] = $file->toArray();
+			  $params->files[]=$file->toArray();
 		  }
 
 			// return some javascript to display a completion status.
@@ -129,12 +129,12 @@ 
           	 Options = new Object();
           	 Options.clientID = '{$this->getClientID()}';
           	 Options.targetID = '{$this->_target->getUniqueID()}';
-          	 Options.errorCode = '" . (int)!$this->getHasAllFiles() . "';
+          	 Options.errorCode = '".(int) !$this->getHasAllFiles()."';
           	 Options.callbackToken = '{$this->pushParamsAndGetToken($params)}';
-          	 Options.fileName = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileName') : $this->getFileName(), JSON_HEX_APOS) . "';
-             Options.fileSize = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileSize') : $this->getFileSize(), JSON_HEX_APOS) . "';
-             Options.fileType = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileType') : $this->getFileType(), JSON_HEX_APOS) . "';
-             Options.errorCode = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'errorCode') : $this->getErrorCode(), JSON_HEX_APOS) . "';
+          	 Options.fileName = '".TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileName') : $this->getFileName(), JSON_HEX_APOS)."';
+             Options.fileSize = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileSize') : $this->getFileSize(), JSON_HEX_APOS)."';
+             Options.fileType = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileType') : $this->getFileType(), JSON_HEX_APOS)."';
+             Options.errorCode = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'errorCode') : $this->getErrorCode(), JSON_HEX_APOS)."';
           	 parent.Prado.WebUI.TActiveFileUpload.onFileUpload(Options);
            </script>";
 
@@ -146,7 +146,7 @@ 
 	 * @return string the path where the uploaded file will be stored temporarily, in namespace format
 	 * default "Application.runtime.*"
 	 */
-	public function getTempPath(){
+	public function getTempPath() {
 		return $this->getViewState('TempPath', 'Application.runtime.*');
 	}
 
@@ -154,15 +154,15 @@ 
 	 * @param string the path where the uploaded file will be stored temporarily in namespace format
 	 * default "Application.runtime.*"
 	 */
-	public function setTempPath($value){
-		$this->setViewState('TempPath',$value,'Application.runtime.*');
+	public function setTempPath($value) {
+		$this->setViewState('TempPath', $value, 'Application.runtime.*');
 	}
 
 	/**
 	 * @return boolean a value indicating whether an automatic callback to the server will occur whenever the user modifies the text in the TTextBox control and then tabs out of the component. Defaults to true.
 	 * Note: When set to false, you will need to trigger the callback yourself.
 	 */
-	public function getAutoPostBack(){
+	public function getAutoPostBack() {
 		return $this->getViewState('AutoPostBack', true);
 	}
 
@@ -170,28 +170,28 @@ 
 	 * @param boolean a value indicating whether an automatic callback to the server will occur whenever the user modifies the text in the TTextBox control and then tabs out of the component. Defaults to true.
 	 * Note: When set to false, you will need to trigger the callback yourself.
 	 */
-	public function setAutoPostBack($value){
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),true);
+	public function setAutoPostBack($value) {
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
 	 * @return string A chuck of javascript that will need to be called if {{@link getAutoPostBack AutoPostBack} is set to false}
 	 */
-	public function getCallbackJavascript(){
+	public function getCallbackJavascript() {
 		return "Prado.WebUI.TActiveFileUpload.fileChanged(\"{$this->getClientID()}\")";
 	}
 
 	/**
 	 * @throws TInvalidDataValueException if the {@link getTempPath TempPath} is not writable.
 	 */
-	public function onInit($sender){
+	public function onInit($sender) {
 		parent::onInit($sender);
 
-		if (!Prado::getApplication()->getCache())
-		  if (!Prado::getApplication()->getSecurityManager())
+		if(!Prado::getApplication()->getCache())
+		  if(!Prado::getApplication()->getSecurityManager())
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
-		if (!is_writable(Prado::getPathOfNamespace($this->getTempPath()))){
+		if(!is_writable(Prado::getPathOfNamespace($this->getTempPath()))) {
 			throw new TInvalidDataValueException("activefileupload_temppath_invalid", $this->getTempPath());
 		}
 	}
@@ -203,18 +203,18 @@ 
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
 	 */
- 	public function raiseCallbackEvent($param){
- 		$cp = $param->getCallbackParameter();
-		if ($key = $cp->targetID == $this->_target->getUniqueID()){
+ 	public function raiseCallbackEvent($param) {
+ 		$cp=$param->getCallbackParameter();
+		if($key=$cp->targetID==$this->_target->getUniqueID()) {
 
-			$params = $this->popParamsByToken($cp->callbackToken);
+			$params=$this->popParamsByToken($cp->callbackToken);
       foreach($params->files as $index => $file)
       {
-  			$_FILES[$key]['name'][$index] = stripslashes($file['fileName']);
-  			$_FILES[$key]['size'][$index] = intval($file['fileSize']);
-  			$_FILES[$key]['type'][$index] = $file['fileType'];
-  			$_FILES[$key]['error'][$index] = intval($file['errorCode']);
-  			$_FILES[$key]['tmp_name'][$index] = $file['localName'];
+  			$_FILES[$key]['name'][$index]=stripslashes($file['fileName']);
+  			$_FILES[$key]['size'][$index]=intval($file['fileSize']);
+  			$_FILES[$key]['type'][$index]=$file['fileType'];
+  			$_FILES[$key]['error'][$index]=intval($file['errorCode']);
+  			$_FILES[$key]['tmp_name'][$index]=$file['localName'];
       }
 			$this->loadPostData($key, null);
 
@@ -234,17 +234,17 @@ 
 
 	protected function pushParamsAndGetToken(TActiveFileUploadCallbackParams $params)
 	{
-		if ($cache = Prado::getApplication()->getCache())
+		if($cache=Prado::getApplication()->getCache())
 			{
 				// this is the most secure method, file info can't be forged from client side, no matter what
-				$token = md5('TActiveFileUpload::Params::'.$this->ClientID.'::'+rand(1000*1000,9999*1000));
-				$cache->set($token, serialize($params), 5*60); // expire in 5 minutes - the callback should arrive back in seconds, actually
+				$token=md5('TActiveFileUpload::Params::'.$this->ClientID.'::'+rand(1000 * 1000, 9999 * 1000));
+				$cache->set($token, serialize($params), 5 * 60); // expire in 5 minutes - the callback should arrive back in seconds, actually
 			}
 		else
-		if ($mgr = Prado::getApplication()->getSecurityManager())
+		if($mgr=Prado::getApplication()->getSecurityManager())
 			{
 				// this is a less secure method, file info can be still forged from client side, but only if attacker knows the secret application key
-				$token = urlencode(base64_encode($mgr->encrypt(serialize($params))));
+				$token=urlencode(base64_encode($mgr->encrypt(serialize($params))));
 			}
 		else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
@@ -254,18 +254,18 @@ 
 
 	protected function popParamsByToken($token)
 	{
-		if ($cache = Prado::getApplication()->getCache())
+		if($cache=Prado::getApplication()->getCache())
 			{
-				$v = $cache->get($token);
+				$v=$cache->get($token);
 				assert($v!='');
 				$cache->delete($token); // remove it from cache so it can't be used again and won't take up space either
-				$params = unserialize($v);
+				$params=unserialize($v);
 			}
 		else
-		if ($mgr = Prado::getApplication()->getSecurityManager())
+		if($mgr=Prado::getApplication()->getSecurityManager())
 			{
-				$v = $mgr->decrypt(base64_decode(urldecode($token)));
-				$params = unserialize($v);
+				$v=$mgr->decrypt(base64_decode(urldecode($token)));
+				$params=unserialize($v);
 			}
 		else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
@@ -282,27 +282,27 @@ 
 	{
 		parent::onPreRender($param);
 
-		if(!$this->getPage()->getIsPostBack() && isset($_GET['TActiveFileUpload_InputId']) && isset($_GET['TActiveFileUpload_TargetId']) && $_GET['TActiveFileUpload_InputId'] == $this->getClientID())
+		if(!$this->getPage()->getIsPostBack() && isset($_GET['TActiveFileUpload_InputId']) && isset($_GET['TActiveFileUpload_TargetId']) && $_GET['TActiveFileUpload_InputId']==$this->getClientID())
 		{
-		  $params = new TActiveFileUploadCallbackParams;
-		  foreach ($this->getFiles() as $file) {
-		    $localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
+		  $params=new TActiveFileUploadCallbackParams;
+		  foreach($this->getFiles() as $file) {
+		    $localName=str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()), ''));
 		    $file->setLocalName($localName);
 		    // tricky workaround to intercept "uploaded file too big" error: real uploads happens in onFileUpload instead
 		    $file->setErrorCode(UPLOAD_ERR_FORM_SIZE);
-		    $params->files[] = $file->toArray();
+		    $params->files[]=$file->toArray();
 		  }
 
 			echo "<script language='Javascript'>
           	 Options = new Object();
           	 Options.clientID = '{$_GET['TActiveFileUpload_InputId']}';
           	 Options.targetID = '{$_GET['TActiveFileUpload_TargetId']}';
-			       Options.errorCode = '" . (int)!$this->getHasAllFiles() . "';
+			       Options.errorCode = '".(int) !$this->getHasAllFiles()."';
           	 Options.callbackToken = '{$this->pushParamsAndGetToken($params)}';
-          	 Options.fileName = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileName') : $this->getFileName(), JSON_HEX_APOS) . "';
-             Options.fileSize = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileSize') : $this->getFileSize(), JSON_HEX_APOS) . "';
-             Options.fileType = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileType') : $this->getFileType(), JSON_HEX_APOS) . "';
-             Options.errorCode = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'errorCode') : $this->getErrorCode(), JSON_HEX_APOS) . "';
+          	 Options.fileName = '".TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileName') : $this->getFileName(), JSON_HEX_APOS)."';
+             Options.fileSize = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileSize') : $this->getFileSize(), JSON_HEX_APOS)."';
+             Options.fileType = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileType') : $this->getFileType(), JSON_HEX_APOS)."';
+             Options.errorCode = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'errorCode') : $this->getErrorCode(), JSON_HEX_APOS)."';
            	 parent.Prado.WebUI.TActiveFileUpload.onFileUpload(Options);
            </script>";
 		}
@@ -312,29 +312,29 @@ 
 	{
 		$this->getPage()->getClientScript()->registerPradoScript('activefileupload');
 
-		$this->_flag = new THiddenField;
+		$this->_flag=new THiddenField;
 		$this->_flag->setID('Flag');
 		$this->getControls()->add($this->_flag);
 
-		$this->_busy = new TImage;
+		$this->_busy=new TImage;
 		$this->_busy->setID('Busy');
 		$this->_busy->setImageUrl($this->getAssetUrl('ActiveFileUploadIndicator.gif'));
 		$this->_busy->setStyle("display:none");
 		$this->getControls()->add($this->_busy);
 
-		$this->_success = new TImage;
+		$this->_success=new TImage;
 		$this->_success->setID('Success');
 		$this->_success->setImageUrl($this->getAssetUrl('ActiveFileUploadComplete.png'));
 		$this->_success->setStyle("display:none");
 		$this->getControls()->add($this->_success);
 
-		$this->_error = new TImage;
+		$this->_error=new TImage;
 		$this->_error->setID('Error');
 		$this->_error->setImageUrl($this->getAssetUrl('ActiveFileUploadError.png'));
 		$this->_error->setStyle("display:none");
 		$this->getControls()->add($this->_error);
 
-		$this->_target = new TInlineFrame;
+		$this->_target=new TInlineFrame;
 		$this->_target->setID('Target');
 		$this->_target->setFrameUrl($this->getAssetUrl('ActiveFileUploadBlank.html'));
 		$this->_target->setStyle("width:0px; height:0px;");
@@ -345,11 +345,11 @@ 
 	/**
 	 * Removes localfile on ending of the callback.
 	 */
-	public function onUnload($param){
-		if ($this->getPage()->getIsCallback())
+	public function onUnload($param) {
+		if($this->getPage()->getIsCallback())
 		{
 		  foreach($this->getFiles() as $file)
-		    if($file->getHasFile() && file_exists($file->getLocalName())){
+		    if($file->getHasFile() && file_exists($file->getLocalName())) {
 		      unlink($file->getLocalName());
 		  }
 		}
@@ -359,7 +359,7 @@ 
 	/**
 	 * @return TBaseActiveCallbackControl standard callback control options.
 	 */
-	public function getActiveControl(){
+	public function getActiveControl() {
 		return $this->getAdapter()->getBaseActiveControl();
 	}
 
@@ -375,17 +375,17 @@ 
 	 * Adds ID attribute, and renders the javascript for active component.
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
-	public function addAttributesToRender($writer){
+	public function addAttributesToRender($writer) {
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
-		$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(),$this->getClientOptions());
+		$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getClientOptions());
 	}
 
 	/**
 	 * @return string corresponding javascript class name for this control.
 	 */
-	protected function getClientClassName(){
+	protected function getClientClassName() {
 		return 'Prado.WebUI.TActiveFileUpload';
 	}
 
@@ -399,18 +399,18 @@ 
 	 * 					completeID => complete client ID,
 	 * 					errorID => error client ID)
 	 */
-	protected function getClientOptions(){
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-
-		$options['inputID'] = $this->getClientID();
-		$options['flagID'] = $this->_flag->getClientID();
-		$options['targetID'] = $this->_target->getUniqueID();
-		$options['formID'] = $this->getPage()->getForm()->getClientID();
-		$options['indicatorID'] = $this->_busy->getClientID();
-		$options['completeID'] = $this->_success->getClientID();
-		$options['errorID'] = $this->_error->getClientID();
-		$options['autoPostBack'] = $this->getAutoPostBack();
+	protected function getClientOptions() {
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+
+		$options['inputID']=$this->getClientID();
+		$options['flagID']=$this->_flag->getClientID();
+		$options['targetID']=$this->_target->getUniqueID();
+		$options['formID']=$this->getPage()->getForm()->getClientID();
+		$options['indicatorID']=$this->_busy->getClientID();
+		$options['completeID']=$this->_success->getClientID();
+		$options['errorID']=$this->_error->getClientID();
+		$options['autoPostBack']=$this->getAutoPostBack();
 		return $options;
 	}
 
@@ -421,12 +421,12 @@ 
 	 * If true, you will not be able to save the uploaded file again.
 	 * @return boolean true if the file saving is successful
 	 */
-	public function saveAs($fileName,$deleteTempFile=true,$index=0){
-		if (($this->getErrorCode($index)===UPLOAD_ERR_OK) && (file_exists($this->getLocalName($index)))){
-			if ($deleteTempFile)
-				return rename($this->getLocalName($index),$fileName);
+	public function saveAs($fileName, $deleteTempFile=true, $index=0) {
+		if(($this->getErrorCode($index)===UPLOAD_ERR_OK) && (file_exists($this->getLocalName($index)))) {
+			if($deleteTempFile)
+				return rename($this->getLocalName($index), $fileName);
 			else
-				return copy($this->getLocalName($index),$fileName);
+				return copy($this->getLocalName($index), $fileName);
 		} else
 			return false;
 	}
@@ -435,7 +435,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		completes successfully.
 	 */
-	public function getSuccessImage(){
+	public function getSuccessImage() {
 		$this->ensureChildControls();
 		return $this->_success;
 	}
@@ -444,7 +444,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		does not complete successfully.
 	 */
-	public function getErrorImage(){
+	public function getErrorImage() {
 		$this->ensureChildControls();
 		return $this->_error;
 	}
@@ -453,7 +453,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		is in progress.
 	 */
-	public function getBusyImage(){
+	public function getBusyImage() {
 		$this->ensureChildControls();
 		return $this->_busy;
 	}

framework/Web/UI/ActiveControls/TActivePager.php

Braces +3 added lines, -6 removed lines

@@ -127,8 +127,7 @@ 
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
-		}
-		else if($buttonType===TPagerButtonType::ImageButton)
+		} else if($buttonType===TPagerButtonType::ImageButton)
 		{
 			$button = new TActiveImageButton;
 			$button->setImageUrl($this->getPageImageUrl($text,$commandName));
@@ -136,8 +135,7 @@ 
 				$button->Visible = true;
 			else
 				$button->Visible = false;
-		}
-		else
+		} else
 		{
 			$button=new TActiveButton;
 			if(!$enabled)
@@ -197,8 +195,7 @@ 
 			TWebControl::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
-		}
-		else
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}

Spacing +15 added lines, -15 removed lines

@@ -103,11 +103,11 @@ 
 		);
 
 		$this->getControls()->add($list);
-		$list->setDataSource(range(1,$this->getPageCount()));
+		$list->setDataSource(range(1, $this->getPageCount()));
 		$list->dataBind();
 		$list->setSelectedIndex($this->getCurrentPageIndex());
 		$list->setAutoPostBack(true);
-		$list->attachEventHandler('OnSelectedIndexChanged',array($this,'listIndexChanged'));
+		$list->attachEventHandler('OnSelectedIndexChanged', array($this, 'listIndexChanged'));
 		$list->attachEventHandler('OnCallback', array($this, 'handleCallback'));
 	}
 
@@ -123,7 +123,7 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($buttonType,$enabled,$text,$commandName,$commandParameter)
+	protected function createPagerButton($buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
 		if($buttonType===TPagerButtonType::LinkButton)
 		{
@@ -139,12 +139,12 @@ 
 		}
 		else if($buttonType===TPagerButtonType::ImageButton)
 		{
-			$button = new TActiveImageButton;
-			$button->setImageUrl($this->getPageImageUrl($text,$commandName));
+			$button=new TActiveImageButton;
+			$button->setImageUrl($this->getPageImageUrl($text, $commandName));
 			if($enabled)
-				$button->Visible = true;
+				$button->Visible=true;
 			else
-				$button->Visible = false;
+				$button->Visible=false;
 		}
 		else
 		{
@@ -155,7 +155,7 @@ 
 
 		if($buttonType===TPagerButtonType::ImageButton)
 		{
-			$button->ImageUrl = $text;
+			$button->ImageUrl=$text;
 		}
 
 		$button->setText($text);
@@ -179,14 +179,14 @@ 
 	 * @param mixed $sender
 	 * @param TCallbackEventParameter $param
 	 */
-	public function handleCallback ($sender,$param)
+	public function handleCallback($sender, $param)
 	{
 		// Update all the buttons pagers attached to the same control.
 		// Dropdown pagers doesn't need to be re-rendered.
 		$controlToPaginate=$this->getControlToPaginate();
-		foreach ($this->getNamingContainer()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false) as $control)
+		foreach($this->getNamingContainer()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false) as $control)
 		{
-			if ($control->getMode() !== TPagerMode::DropDownList && $control->getControlToPaginate()===$controlToPaginate)
+			if($control->getMode()!==TPagerMode::DropDownList && $control->getControlToPaginate()===$controlToPaginate)
 			{
 				$control->render($param->getNewWriter());
 				// FIXME : With some very fast machine, the getNewWriter() consecutive calls are in the same microsecond, resulting
@@ -198,18 +198,18 @@ 
 		$this->onCallback($param);
 	}
 
-	public function render ($writer)
+	public function render($writer)
 	{
 		if($this->getHasPreRendered())
 		{
-			$this->setDisplay(($this->getPageCount()==1)?TDisplayStyle::None:TDisplayStyle::Dynamic);
+			$this->setDisplay(($this->getPageCount()==1) ?TDisplayStyle::None : TDisplayStyle::Dynamic);
 			TWebControl::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
+				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
 		}
 		else
 		{
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 }

framework/Web/UI/ActiveControls/TAutoComplete.php

Braces +2 added lines, -4 removed lines

@@ -174,14 +174,12 @@
 			{
 				$parameter = new TAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
-			}
-			else if($token[1] === '__TAutoComplete_onSuggestionSelected__')
+			} else if($token[1] === '__TAutoComplete_onSuggestionSelected__')
 			{
 				$parameter = new TAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
-		}
-		else if($this->getAutoPostBack())
+		} else if($this->getAutoPostBack())
 			parent::raiseCallbackEvent($param);
 	}
 

Doc Comments +2 added lines

@@ -201,6 +201,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TAutoCompleteEventParameter $param
 	 */
 	public function onSuggest($param)
 	{
@@ -213,6 +214,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TAutoCompleteEventParameter $param
 	 */
 	public function onSuggestionSelected($param)
 	{

Spacing +30 added lines, -30 removed lines

@@ -130,7 +130,7 @@ 
 	 */
 	public function setFrequency($value)
 	{
-		$this->setViewState('frequency', TPropertyValue::ensureFloat($value),'');
+		$this->setViewState('frequency', TPropertyValue::ensureFloat($value), '');
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function getMinChars()
 	{
-		return $this->getViewState('minChars','');
+		return $this->getViewState('minChars', '');
 	}
 
 	/**
@@ -177,17 +177,17 @@ 
 	 */
  	public function raiseCallbackEvent($param)
 	{
-		$token = $param->getCallbackParameter();
-		if(is_array($token) && count($token) == 2)
+		$token=$param->getCallbackParameter();
+		if(is_array($token) && count($token)==2)
 		{
-			if($token[1] === '__TAutoComplete_onSuggest__')
+			if($token[1]==='__TAutoComplete_onSuggest__')
 			{
-				$parameter = new TAutoCompleteEventParameter($this->getResponse(), $token[0]);
+				$parameter=new TAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
 			}
-			else if($token[1] === '__TAutoComplete_onSuggestionSelected__')
+			else if($token[1]==='__TAutoComplete_onSuggestionSelected__')
 			{
-				$parameter = new TAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
+				$parameter=new TAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
 		}
@@ -244,7 +244,7 @@ 
 	public function getResultPanel()
 	{
 		if($this->_resultPanel===null)
-			$this->_resultPanel = $this->createResultPanel();
+			$this->_resultPanel=$this->createResultPanel();
 		return $this->_resultPanel;
 	}
 
@@ -253,7 +253,7 @@ 
 	 */
 	protected function createResultPanel()
 	{
-		$panel = new TPanel;
+		$panel=new TPanel;
 		$this->getControls()->add($panel);
 		$panel->setID('result');
 		return $panel;
@@ -265,7 +265,7 @@ 
 	public function getSuggestions()
 	{
 		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+			$this->_repeater=$this->createRepeater();
 		return $this->_repeater;
 	}
 
@@ -274,10 +274,10 @@ 
 	 */
 	protected function createRepeater()
 	{
-		$repeater = new TRepeater;
+		$repeater=new TRepeater;
 		$repeater->setHeaderTemplate(new TAutoCompleteTemplate('<ul>'));
 		$repeater->setFooterTemplate(new TAutoCompleteTemplate('</ul>'));
-		$repeater->setItemTemplate(new TTemplate('<li><%# $this->DataItem %></li>',null));
+		$repeater->setItemTemplate(new TTemplate('<li><%# $this->DataItem %></li>', null));
 		$repeater->setEmptyTemplate(new TAutoCompleteTemplate('<ul></ul>'));
 		$this->getControls()->add($repeater);
 		return $repeater;
@@ -321,7 +321,7 @@ 
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
 			$this->getSuggestions()->render($writer);
-			$boundary = $writer->getWriter()->getBoundary();
+			$boundary=$writer->getWriter()->getBoundary();
 			$this->getResponse()->getAdapter()->setResponseData($boundary);
 		}
 	}
@@ -333,29 +333,29 @@ 
 	{
 		//disallow page state update ?
 		//$this->getActiveControl()->getClientSide()->setEnablePageStateUpdate(false);
-		$options = array();
-		if(strlen($string = $this->getSeparator()))
+		$options=array();
+		if(strlen($string=$this->getSeparator()))
 		{
-			$string = strtr($string,array('\t'=>"\t",'\n'=>"\n",'\r'=>"\r"));
-			$token = preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);
-			$options['tokens'] = $token;
+			$string=strtr($string, array('\t'=>"\t", '\n'=>"\n", '\r'=>"\r"));
+			$token=preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);
+			$options['tokens']=$token;
 		}
 		if($this->getAutoPostBack())
 		{
-			$options = array_merge($options,parent::getPostBackOptions());
-			$options['AutoPostBack'] = true;
+			$options=array_merge($options, parent::getPostBackOptions());
+			$options['AutoPostBack']=true;
 		}
-		if(strlen($select = $this->getTextCssClass()))
-			$options['select'] = $select;
-		$options['ResultPanel'] = $this->getResultPanel()->getClientID();
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
+		if(strlen($select=$this->getTextCssClass()))
+			$options['select']=$select;
+		$options['ResultPanel']=$this->getResultPanel()->getClientID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
 		if(($minchars=$this->getMinChars())!=='')
-			$options['minChars'] = $minchars;
+			$options['minChars']=$minchars;
 		if(($frequency=$this->getFrequency())!=='')
-			$options['frequency'] = $frequency;
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
+			$options['frequency']=$frequency;
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
 		return $options;
 	}
 

framework/Web/UI/ActiveControls/TActiveRepeater.php

Braces +1 added lines, -2 removed lines

@@ -95,8 +95,7 @@
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}
 	}

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
 		parent::setDataSource($value);
 		if($this->getActiveControl()->canUpdateClientSide()) {
 			$this->renderPager();
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 		}
 	}
 
@@ -94,10 +94,10 @@ 
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
+			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
 		}
 		else {
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 
@@ -111,7 +111,7 @@ 
 		foreach($pager as $item) {
 			if($item->ControlToPaginate==$this->ID) {
 				$writer=$this->getResponse()->createHtmlWriter();
-				$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 			}
 		}
 	}
@@ -123,7 +123,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	private function renderRepeater($writer) {
-		$writer->addAttribute('id',$this->getSurroundingTagID());
+		$writer->addAttribute('id', $this->getSurroundingTagID());
 		$writer->renderBeginTag($this->getSurroundingTag());
 		parent::render($writer);
 		$writer->renderEndTag();