pradosoft / prado

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 = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileName')) : $this->getFileName()) . "';
-             Options.fileSize = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileSize')) : $this->getFileSize()) . "';
-             Options.fileType = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileType')) : $this->getFileType()) . "';
-             Options.errorCode = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'errorCode')) : $this->getErrorCode()) . "';
+          	 Options.fileName = '".($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileName')) : $this->getFileName())."';
+             Options.fileSize = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileSize')) : $this->getFileSize())."';
+             Options.fileType = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileType')) : $this->getFileType())."';
+             Options.errorCode = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'errorCode')) : $this->getErrorCode())."';
           	 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 = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileName')) : $this->getFileName()) . "';
-             Options.fileSize = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileSize')) : $this->getFileSize()) . "';
-             Options.fileType = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileType')) : $this->getFileType()) . "';
-             Options.errorCode = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'errorCode')) : $this->getErrorCode()) . "';
+          	 Options.fileName = '".($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileName')) : $this->getFileName())."';
+             Options.fileSize = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileSize')) : $this->getFileSize())."';
+             Options.fileType = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'fileType')) : $this->getFileType())."';
+             Options.errorCode = '" . ($this->getMultiple() ? TJavaScript::jsonEncode(array_column($params->files, 'errorCode')) : $this->getErrorCode())."';
            	 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();

framework/Web/UI/ActiveControls/TCallbackClientScript.php

Braces +3 added lines, -6 removed lines

@@ -424,13 +424,11 @@ 
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
 			$content = null;
-		}
-		else if($content instanceof THtmlWriter)
+		} else if($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 			$content = null;
-		}
-		else
+		} else
 			$boundary = null;
 
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
@@ -477,8 +475,7 @@ 
 		if($content instanceof TControl)
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
-		}
-		elseif($content instanceof THtmlWriter)
+		} elseif($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 		}

Spacing +36 added lines, -36 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_actions = new TList;
+		$this->_actions=new TList;
 	}
 
 	/**
@@ -88,14 +88,14 @@ 
 	public function callClientFunction($function, $params=array())
 	{
 		if(!is_array($params))
-			$params = array($params);
+			$params=array($params);
 
 		if(count($params) > 0)
 		{
-			if ($params[0] instanceof ISurroundable)
-				$params[0] = $params[0]->getSurroundingTagID();
+			if($params[0] instanceof ISurroundable)
+				$params[0]=$params[0]->getSurroundingTagID();
 			elseif($params[0] instanceof TControl)
-				$params[0] = $params[0]->getClientID();
+				$params[0]=$params[0]->getClientID();
 		}
 		$this->_actions->add(array($function => $params));
 	}
@@ -108,13 +108,13 @@ 
 	 */
 	public function jQuery($element, $method, $params=array())
 	{
-		if ($element instanceof ISurroundable)
-			$element = $element->getSurroundingTagID();
+		if($element instanceof ISurroundable)
+			$element=$element->getSurroundingTagID();
 		elseif($element instanceof TControl)
-			$element = $element->getClientID();
+			$element=$element->getClientID();
 
 		if(!is_array($params))
-			$params = array($params);
+			$params=array($params);
 
 		$this->_actions->add(array('Prado.Element.j' => array($element, $method, $params)));
 	}
@@ -147,14 +147,14 @@ 
 	 */
 	public function select($control, $method='Value', $value=null, $type=null)
 	{
-		$method = TPropertyValue::ensureEnum($method,
+		$method=TPropertyValue::ensureEnum($method,
 				'Value', 'Index', 'Clear', 'Indices', 'Values', 'All', 'Invert');
-		$type = ($type===null) ? $this->getSelectionControlType($control) : $type;
-		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
+		$type=($type===null) ? $this->getSelectionControlType($control) : $type;
+		$total=$this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
 
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
 		if($control instanceof TControl)
-			$control = $control->getClientID();
+			$control=$control->getClientID();
 
 		$this->callClientFunction('Prado.Element.select',
 				array($control, $type.$method, $value, $total));
@@ -214,9 +214,9 @@ 
 	public function setAttribute($control, $name, $value)
 	{
 		// Attributes should be applied on Surrounding tag, except for 'disabled' attribute
-		if ($control instanceof ISurroundable && strtolower($name)!=='disabled')
+		if($control instanceof ISurroundable && strtolower($name)!=='disabled')
 			$control=$control->getSurroundingTagID();
-		$this->callClientFunction('Prado.Element.setAttribute',array($control, $name, $value));
+		$this->callClientFunction('Prado.Element.setAttribute', array($control, $name, $value));
 	}
 
 	/**
@@ -226,25 +226,25 @@ 
 	 */
 	public function setListItems($control, $items)
 	{
-		$options = array();
+		$options=array();
 		if($control instanceof TListControl)
 		{
-			$promptText		= $control->getPromptText();
-			$promptValue	= $control->getPromptValue();
+			$promptText=$control->getPromptText();
+			$promptValue=$control->getPromptValue();
 
 			if($promptValue==='')
-				$promptValue = $promptText;
+				$promptValue=$promptText;
 
 			if($promptValue!=='')
-				$options[] = array($promptText, $promptValue);
+				$options[]=array($promptText, $promptValue);
 		}
 
 		foreach($items as $item)
 		{
 			if($item->getHasAttributes())
-				$options[] =  array($item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group'));
+				$options[]=array($item->getText(), $item->getValue(), $item->getAttributes()->itemAt('Group'));
 			else
-				$options[] = array($item->getText(),$item->getValue());
+				$options[]=array($item->getText(), $item->getValue());
 		}
 		$this->callClientFunction('Prado.Element.setOptions', array($control, $options));
 	}
@@ -422,16 +422,16 @@ 
 	{
 		if($content instanceof TControl)
 		{
-			$boundary = $this->getRenderedContentBoundary($content);
-			$content = null;
+			$boundary=$this->getRenderedContentBoundary($content);
+			$content=null;
 		}
 		else if($content instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($content);
-			$content = null;
+			$boundary=$this->getResponseContentBoundary($content);
+			$content=null;
 		}
 		else
-			$boundary = null;
+			$boundary=null;
 
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
 	}
@@ -456,11 +456,11 @@ 
 	{
 		if($writer instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($writer);
-			$content = null;
+			$boundary=$this->getResponseContentBoundary($writer);
+			$content=null;
 		} else {
-			$boundary = null;
-			$content = $writer;
+			$boundary=null;
+			$content=$writer;
 		}
 
 		$this->callClientFunction('Prado.Element.evaluateScript', array($content, $boundary));
@@ -476,11 +476,11 @@ 
 	{
 		if($content instanceof TControl)
 		{
-			$boundary = $this->getRenderedContentBoundary($content);
+			$boundary=$this->getRenderedContentBoundary($content);
 		}
 		elseif($content instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($content);
+			$boundary=$this->getResponseContentBoundary($content);
 		}
 
 		$this->callClientFunction('Prado.Element.appendScriptBlock', array($boundary));
@@ -496,8 +496,8 @@ 
 	 */
 	private function getRenderedContentBoundary($control)
 	{
-		$writer = $this->getResponse()->createHtmlWriter();
-		$adapter = $control->getPage()->getAdapter();
+		$writer=$this->getResponse()->createHtmlWriter();
+		$adapter=$control->getPage()->getAdapter();
 		$adapter->registerControlToRender($control, $writer);
 		return $writer->getWriter()->getBoundary();
 	}
@@ -561,7 +561,7 @@ 
 	 */
 	public function fadeTo($element, $value, $duration=500)
 	{
-		$value = TPropertyValue::ensureFloat($value);
+		$value=TPropertyValue::ensureFloat($value);
 		$this->visualEffect('fadeTo', $element, array($duration, $value));
 	}
 

Doc Comments +8 added lines

@@ -94,6 +94,7 @@ 
 	 * Executes a client-side statement.
 	 * @param string javascript function name
 	 * @param array list of arguments for the function
+	 * @param string $function
 	 */
 	public function callClientFunction($function, $params=array())
 	{
@@ -154,6 +155,7 @@ 
 	 * @param string selection method
 	 * @param string|int the value or index to select/check.
 	 * @param string selection control type, either 'check' or 'select'
+	 * @param string $type
 	 */
 	public function select($control, $method='Value', $value=null, $type=null)
 	{
@@ -423,6 +425,7 @@ 
 	 * @param TControl control element or HTML element id.
 	 * @param string HTML fragement or the control to be rendered.
 	 * @param boolean whether to fully replace the element or just its inner content.
+	 * @param boolean $self
 	 * @see insertAbout
 	 * @see insertBelow
 	 * @see insertBefore
@@ -481,6 +484,7 @@ 
 	 * Similar to to evaluateScript(), but functions declared in the
 	 * inline block will be available to page elements.
 	 * @param THtmlWriter writer for the content.
+	 * @param \Prado\TComponent $content
 	 */
 	public function appendScriptBlock($content)
 	{
@@ -502,6 +506,7 @@ 
 	 * component developers. The render() method is defered to be called in the
 	 * TActivePageAdapter class.
 	 * @param TControl control to be rendered on callback response.
+	 * @param TControl $control
 	 * @return string the boundary for which the rendered content is wrapped.
 	 */
 	private function getRenderedContentBoundary($control)
@@ -514,6 +519,7 @@ 
 
 	/**
 	 * @param THtmlWriter the writer responsible for rendering html content.
+	 * @param THtmlWriter $html
 	 * @return string content boundary.
 	 */
 	private function getResponseContentBoundary($html)
@@ -533,6 +539,7 @@ 
 	 * @param string visual effect function name.
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
+	 * @param string $type
 	 */
 	public function visualEffect($type, $element, $options=array())
 	{
@@ -640,6 +647,7 @@ 
 	 * @param string visual effect function name.
 	 * @param TControl control element or element id
 	 * @param array effect options.
+	 * @param string $effect
 	 */
 	public function juiEffect($element, $effect, $options=array())
 	{

framework/Collections/TStack.php

Braces +1 added lines, -2 removed lines

@@ -78,8 +78,7 @@
 				$this->_d[]=$item;
 				++$this->_c;
 			}
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 	/**
 	 * Returns an iterator for traversing the items in the stack.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the stack.
+	 * @return \ArrayIterator an iterator for traversing the items in the stack.
 	 */
 	public function getIterator()
 	{

Spacing +4 added lines, -4 removed lines

@@ -102,7 +102,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item,$this->_d,true)!==false;
+		return array_search($item, $this->_d, true)!==false;
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 		if($this->_c===0)
 			throw new TInvalidOperationException('stack_empty');
 		else
-			return $this->_d[$this->_c-1];
+			return $this->_d[$this->_c - 1];
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	public function push($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new \ArrayIterator( $this->_d );
+		return new \ArrayIterator($this->_d);
 	}
 
 	/**