pradosoft / prado

framework/Web/UI/ActiveControls/TActiveListBox.php

Spacing +3 added lines, -3 removed lines

@@ -89,13 +89,13 @@
 	 */
 	public function setSelectionMode($value)
 	{
-		if(parent::getSelectionMode() === $value)
+		if (parent::getSelectionMode() === $value)
 			return;
 
 		parent::setSelectionMode($value);
 		$multiple = $this->getIsMultiSelect();
-		$id = $this->getUniqueID(); $multi_id = $id . '[]';
-		if($this->getActiveControl()->canUpdateClientSide())
+		$id = $this->getUniqueID(); $multi_id = $id.'[]';
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
 			$client = $this->getPage()->getCallbackClient();
 			$client->setAttribute($this, 'multiple', $multiple ? 'multiple' : false);

Braces +6 added lines, -4 removed lines

@@ -89,8 +89,9 @@ 
 	 */
 	public function setSelectionMode($value)
 	{
-		if(parent::getSelectionMode() === $value)
-			return;
+		if(parent::getSelectionMode() === $value) {
+					return;
+		}
 
 		parent::setSelectionMode($value);
 		$multiple = $this->getIsMultiSelect();
@@ -151,9 +152,10 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->getAutoPostBack())
-			$this->getActiveControl()->registerCallbackClientScript(
+		if ($this->getAutoPostBack()) {
+					$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
+		}
 	}
 }
 

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Spacing +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
 	 */
 	public function setPostBackTarget($value)
 	{
-		if($value instanceof TControl)
+		if ($value instanceof TControl)
 			$value = $value->getUniqueID();
 		$this->setOption('EventTarget', $value);
 	}

Braces +3 added lines, -2 removed lines

@@ -273,8 +273,9 @@
 	 */
 	public function setPostBackTarget($value)
 	{
-		if($value instanceof TControl)
-			$value = $value->getUniqueID();
+		if($value instanceof TControl) {
+					$value = $value->getUniqueID();
+		}
 		$this->setOption('EventTarget', $value);
 	}
 

framework/Web/UI/ActiveControls/TActiveHtmlArea4.php

Spacing +2 added lines, -2 removed lines

@@ -64,9 +64,9 @@
    */
   public function setText($value) {
 	parent::setText($value);
-	if($this->getActiveControl()->canUpdateClientSide() && $this->getHasLoadedPostData())
+	if ($this->getActiveControl()->canUpdateClientSide() && $this->getHasLoadedPostData())
 	{
-	  if($this->getEnableVisualEdit())
+	  if ($this->getEnableVisualEdit())
 	  {
 		$value = str_ireplace(["\r\n", "\n"], "", $value);
 		$command = "tinymce.get('{$this->getClientID()}').setContent('{$value}')";

Braces +2 added lines, -2 removed lines

@@ -71,9 +71,9 @@
 		$value = str_ireplace(["\r\n", "\n"], "", $value);
 		$command = "tinymce.get('{$this->getClientID()}').setContent('{$value}')";
 		$this->getPage()->getCallbackClient()->evaluateScript($command);
+	  } else {
+	  		$this->getPage()->getCallbackClient()->setValue($this, $value);
 	  }
-	  else
-		$this->getPage()->getCallbackClient()->setValue($this, $value);
 	}
   }
 

framework/Web/UI/ActiveControls/TTriggeredCallback.php

Spacing +2 added lines, -2 removed lines

@@ -50,9 +50,9 @@
 	protected function getTargetControl()
 	{
 		$id = $this->getControlID();
-		if(($control = $this->findControl($id)) instanceof TControl)
+		if (($control = $this->findControl($id)) instanceof TControl)
 			return $control->getClientID();
-		if($id === '')
+		if ($id === '')
 		{
 			throw new TConfigurationException(
 				'ttriggeredcallback_invalid_controlid', get_class($this));

Braces +3 added lines, -2 removed lines

@@ -50,8 +50,9 @@
 	protected function getTargetControl()
 	{
 		$id = $this->getControlID();
-		if(($control = $this->findControl($id)) instanceof TControl)
-			return $control->getClientID();
+		if(($control = $this->findControl($id)) instanceof TControl) {
+					return $control->getClientID();
+		}
 		if($id === '')
 		{
 			throw new TConfigurationException(

framework/Web/UI/ActiveControls/TActiveHyperLinkColumn.php

Spacing +10 added lines, -10 removed lines

@@ -37,12 +37,12 @@ 
 	{
 		$text = $this->getHeaderText();
 
-		if(($classPath = $this->getHeaderRenderer()) !== '')
+		if (($classPath = $this->getHeaderRenderer()) !== '')
 		{
 			$control = Prado::createComponent($classPath);
-			if($control instanceof \Prado\IDataRenderer)
+			if ($control instanceof \Prado\IDataRenderer)
 			{
-				if($control instanceof IItemDataRenderer)
+				if ($control instanceof IItemDataRenderer)
 				{
 					$item = $cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
@@ -52,21 +52,21 @@ 
 			}
 			$cell->getControls()->add($control);
 		}
-		elseif($this->getAllowSorting())
+		elseif ($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
-			if(($url = $this->getHeaderImageUrl()) !== '')
+			if (($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$button = new TActiveImageButton;
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text !== '')
+				if ($text !== '')
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
 			}
-			elseif($text !== '')
+			elseif ($text !== '')
 			{
 				$button = new TActiveLinkButton;
 				$button->setText($text);
@@ -80,15 +80,15 @@ 
 		}
 		else
 		{
-			if(($url = $this->getHeaderImageUrl()) !== '')
+			if (($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$image = new TActiveImage;
 				$image->setImageUrl($url);
-				if($text !== '')
+				if ($text !== '')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
 			}
-			elseif($text !== '')
+			elseif ($text !== '')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');

Braces +15 added lines, -16 removed lines

@@ -51,8 +51,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		elseif($this->getAllowSorting())
+		} elseif($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
 			if(($url = $this->getHeaderImageUrl()) !== '')
@@ -61,12 +60,12 @@ 
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text !== '')
-					$button->setAlternateText($text);
+				if($text !== '') {
+									$button->setAlternateText($text);
+				}
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			elseif($text !== '')
+			} elseif($text !== '')
 			{
 				$button = new TActiveLinkButton;
 				$button->setText($text);
@@ -74,24 +73,24 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
+			} else {
+							$cell->setText(' ');
 			}
-			else
-				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$image = new TActiveImage;
 				$image->setImageUrl($url);
-				if($text !== '')
-					$image->setAlternateText($text);
+				if($text !== '') {
+									$image->setAlternateText($text);
+				}
 				$cell->getControls()->add($image);
+			} elseif($text !== '') {
+							$cell->setText($text);
+			} else {
+							$cell->setText(' ');
 			}
-			elseif($text !== '')
-				$cell->setText($text);
-			else
-				$cell->setText(' ');
 		}
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveClientScript.php

Spacing +6 added lines, -6 removed lines

@@ -45,13 +45,13 @@ 
 	 */
 	protected function renderCustomScriptFile($writer)
 	{
-		if(($scriptUrl = $this->getScriptUrl()) !== '')
+		if (($scriptUrl = $this->getScriptUrl()) !== '')
 		{
-			if($this->getPage()->getIsCallback())
+			if ($this->getPage()->getIsCallback())
 			{
 				$cs = $this->getPage()->getClientScript();
-				$uniqueid = $this->ClientID . '_custom';
-				if(!$cs->isScriptFileRegistered($uniqueid))
+				$uniqueid = $this->ClientID.'_custom';
+				if (!$cs->isScriptFileRegistered($uniqueid))
 					$cs->registerScriptFile($uniqueid, $scriptUrl);
 			} else {
 				$writer->write("<script type=\"text/javascript\" src=\"$scriptUrl\"></script>\n");
@@ -65,9 +65,9 @@ 
 	 */
 	protected function renderCustomScript($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			if($this->getPage()->getIsCallback())
+			if ($this->getPage()->getIsCallback())
 			{
 				$extWriter = $this->getPage()->getResponse()->createHtmlWriter();
 				$extWriter->write("/*<![CDATA[*/\n");

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
 			{
 				$cs = $this->getPage()->getClientScript();
 				$uniqueid = $this->ClientID . '_custom';
-				if(!$cs->isScriptFileRegistered($uniqueid))
-					$cs->registerScriptFile($uniqueid, $scriptUrl);
+				if(!$cs->isScriptFileRegistered($uniqueid)) {
+									$cs->registerScriptFile($uniqueid, $scriptUrl);
+				}
 			} else {
 				$writer->write("<script type=\"text/javascript\" src=\"$scriptUrl\"></script>\n");
 			}

framework/Web/UI/ActiveControls/TBaseActiveCallbackControl.php

Spacing +9 added lines, -9 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if(($client = $this->getOption('ClientSide')) === null)
+		if (($client = $this->getOption('ClientSide')) === null)
 		{
 			$client = $this->createClientSide();
 			$this->setOption('ClientSide', $client);
@@ -63,7 +63,7 @@ 
 	 */
 	public function setClientSide($client)
 	{
-		if($this->getOption('ClientSide') === null)
+		if ($this->getOption('ClientSide') === null)
 			$this->setOption('ClientSide', $client);
 		else
 			throw new TConfigurationException(
@@ -108,9 +108,9 @@ 
 	 */
 	protected function getDefaultClientSideOptions()
 	{
-		if(($id = $this->getCallbackOptions()) !== '')
+		if (($id = $this->getCallbackOptions()) !== '')
 		{
-			if(($pos = strrpos($id, '.')) !== false)
+			if (($pos = strrpos($id, '.')) !== false)
 			{
 				$control = $this->getControl()->getSubProperty(substr($id, 0, $pos));
 				$newid = substr($id, $pos + 1);
@@ -124,7 +124,7 @@ 
 				$control = $this->getControl()->findControl($id, true);
 			}
 
-			if($control instanceof TCallbackOptions)
+			if ($control instanceof TCallbackOptions)
 				return $control->getClientSide()->getOptions()->toArray();
 			else
 				throw new TConfigurationException('callback_invalid_callback_options', $this->getControl()->getID(), $id);
@@ -175,7 +175,7 @@ 
 	 */
 	public function canCauseValidation()
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
@@ -213,7 +213,7 @@ 
 		$options['ValidationGroup'] = $this->getValidationGroup();
 		$options['CallbackParameter'] = $this->getCallbackParameter();
 		// needed for TCallback
-		if(!isset($options['EventTarget']))
+		if (!isset($options['EventTarget']))
 			$options['EventTarget'] = $this->getControl()->getUniqueID();
 		return $options;
 	}
@@ -230,13 +230,13 @@ 
 	public function registerCallbackClientScript($class, $options = null)
 	{
 		$cs = $this->getPage()->getClientScript();
-		if(is_array($options))
+		if (is_array($options))
 			$options = array_merge($this->getClientSideOptions(), $options);
 		else
 			$options = $this->getClientSideOptions();
 
 		//remove true as default to save bytes
-		if($options['CausesValidation'] === true)
+		if ($options['CausesValidation'] === true)
 			$options['CausesValidation'] = '';
 		$cs->registerCallbackControl($class, $options);
 	}

Braces +27 added lines, -22 removed lines

@@ -63,11 +63,12 @@ 
 	 */
 	public function setClientSide($client)
 	{
-		if($this->getOption('ClientSide') === null)
-			$this->setOption('ClientSide', $client);
-		else
-			throw new TConfigurationException(
+		if($this->getOption('ClientSide') === null) {
+					$this->setOption('ClientSide', $client);
+		} else {
+					throw new TConfigurationException(
 				'active_controls_client_side_exists', $this->getControl()->getID());
+		}
 	}
 
 	/**
@@ -114,20 +115,21 @@ 
 			{
 				$control = $this->getControl()->getSubProperty(substr($id, 0, $pos));
 				$newid = substr($id, $pos + 1);
-				if ($control !== null)
-					$control = $control->$newid;
-			}
-			else
+				if ($control !== null) {
+									$control = $control->$newid;
+				}
+			} else
 			{
 				// TCheckBoxList overrides findControl() with a fake implementation
 				// but accepts a second parameter to use the standard one
 				$control = $this->getControl()->findControl($id, true);
 			}
 
-			if($control instanceof TCallbackOptions)
-				return $control->getClientSide()->getOptions()->toArray();
-			else
-				throw new TConfigurationException('callback_invalid_callback_options', $this->getControl()->getID(), $id);
+			if($control instanceof TCallbackOptions) {
+							return $control->getClientSide()->getOptions()->toArray();
+			} else {
+							throw new TConfigurationException('callback_invalid_callback_options', $this->getControl()->getID(), $id);
+			}
 		}
 
 		return [];
@@ -179,9 +181,9 @@ 
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -213,8 +215,9 @@ 
 		$options['ValidationGroup'] = $this->getValidationGroup();
 		$options['CallbackParameter'] = $this->getCallbackParameter();
 		// needed for TCallback
-		if(!isset($options['EventTarget']))
-			$options['EventTarget'] = $this->getControl()->getUniqueID();
+		if(!isset($options['EventTarget'])) {
+					$options['EventTarget'] = $this->getControl()->getUniqueID();
+		}
 		return $options;
 	}
 
@@ -230,14 +233,16 @@ 
 	public function registerCallbackClientScript($class, $options = null)
 	{
 		$cs = $this->getPage()->getClientScript();
-		if(is_array($options))
-			$options = array_merge($this->getClientSideOptions(), $options);
-		else
-			$options = $this->getClientSideOptions();
+		if(is_array($options)) {
+					$options = array_merge($this->getClientSideOptions(), $options);
+		} else {
+					$options = $this->getClientSideOptions();
+		}
 
 		//remove true as default to save bytes
-		if($options['CausesValidation'] === true)
-			$options['CausesValidation'] = '';
+		if($options['CausesValidation'] === true) {
+					$options['CausesValidation'] = '';
+		}
 		$cs->registerCallbackControl($class, $options);
 	}
 

framework/Web/UI/ActiveControls/TActiveBoundColumn.php

Spacing +10 added lines, -10 removed lines

@@ -37,10 +37,10 @@ 
 	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text = $this->getHeaderText();
 
-		if(($classPath = $this->getHeaderRenderer()) !== '') {
+		if (($classPath = $this->getHeaderRenderer()) !== '') {
 			$control = Prado::createComponent($classPath);
-			if($control instanceof \Prado\IDataRenderer) {
-				if($control instanceof IItemDataRenderer) {
+			if ($control instanceof \Prado\IDataRenderer) {
+				if ($control instanceof IItemDataRenderer) {
 					$item = $cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
 					$control->setItemType($item->getItemType());
@@ -49,21 +49,21 @@ 
 			}
 			$cell->getControls()->add($control);
 		}
-		elseif($this->getAllowSorting()) {
+		elseif ($this->getAllowSorting()) {
 				$sortExpression = $this->getSortExpression();
-				if(($url = $this->getHeaderImageUrl()) !== '') {
+				if (($url = $this->getHeaderImageUrl()) !== '') {
 					$button = new TActiveImageButton;
 					$button->setImageUrl($url);
 					$button->setCommandName(TDataGrid::CMD_SORT);
 					$button->setCommandParameter($sortExpression);
-					if($text !== '') {
+					if ($text !== '') {
 						$button->setAlternateText($text);
 						$button->setToolTip($text);
 					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
 				}
-				elseif($text !== '') {
+				elseif ($text !== '') {
 						$button = new TActiveLinkButton;
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
@@ -75,16 +75,16 @@ 
 						$cell->setText(' ');
 			}
 			else {
-				if(($url = $this->getHeaderImageUrl()) !== '') {
+				if (($url = $this->getHeaderImageUrl()) !== '') {
 					$image = new TActiveImage;
 					$image->setImageUrl($url);
-					if($text !== '') {
+					if ($text !== '') {
 						$image->setAlternateText($text);
 						$image->setToolTip($text);
 					}
 					$cell->getControls()->add($image);
 				}
-				elseif($text !== '')
+				elseif ($text !== '')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');

Braces +10 added lines, -13 removed lines

@@ -48,8 +48,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		elseif($this->getAllowSorting()) {
+		} elseif($this->getAllowSorting()) {
 				$sortExpression = $this->getSortExpression();
 				if(($url = $this->getHeaderImageUrl()) !== '') {
 					$button = new TActiveImageButton;
@@ -62,19 +61,17 @@ 
 					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				elseif($text !== '') {
+				} elseif($text !== '') {
 						$button = new TActiveLinkButton;
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
+					} else {
+											$cell->setText(' ');
 					}
-					else
-						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url = $this->getHeaderImageUrl()) !== '') {
 					$image = new TActiveImage;
 					$image->setImageUrl($url);
@@ -83,11 +80,11 @@ 
 						$image->setToolTip($text);
 					}
 					$cell->getControls()->add($image);
-				}
-				elseif($text !== '')
-						$cell->setText($text);
-					else
-						$cell->setText(' ');
+				} elseif($text !== '') {
+										$cell->setText($text);
+				} else {
+											$cell->setText(' ');
+					}
 			}
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveFileUpload.php

Spacing +37 added lines, -37 removed lines

@@ -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));
 	}
@@ -102,7 +102,7 @@ 
 	protected function getAssetUrl($file = '')
 	{
 		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
-		return $base . '/' . self::SCRIPT_PATH . '/' . $file;
+		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
 
@@ -114,7 +114,7 @@ 
 	 */
 	public function onFileUpload($param)
 	{
-		if ($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param == $this->_target->getUniqueID()){
+		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) {
@@ -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,7 +154,7 @@ 
 	 * @param string the path where the uploaded file will be stored temporarily in namespace format
 	 * default "Application.runtime.*"
 	 */
-	public function setTempPath($value){
+	public function setTempPath($value) {
 		$this->setViewState('TempPath', $value, 'Application.runtime.*');
 	}
 
@@ -162,7 +162,7 @@ 
 	 * @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){
+	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())
 			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,12 +203,12 @@ 
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
 	 */
-	public function raiseCallbackEvent($param){
+	public function raiseCallbackEvent($param) {
 		$cp = $param->getCallbackParameter();
-		if ($key = $cp->targetID == $this->_target->getUniqueID()){
+		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']);
@@ -237,7 +237,7 @@ 
 		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));
+				$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
 			}
 		elseif ($mgr = Prado::getApplication()->getSecurityManager())
@@ -280,7 +280,7 @@ 
 	{
 		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) {
@@ -295,12 +295,12 @@ 
           	 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>";
 		}
@@ -343,11 +343,11 @@ 
 	/**
 	 * Removes localfile on ending of the callback.
 	 */
-	public function onUnload($param){
+	public function onUnload($param) {
 		if ($this->getPage()->getIsCallback())
 		{
-		  foreach($this->getFiles() as $file)
-			if($file->getHasFile() && file_exists($file->getLocalName())){
+		  foreach ($this->getFiles() as $file)
+			if ($file->getHasFile() && file_exists($file->getLocalName())) {
 			  unlink($file->getLocalName());
 		  }
 		}
@@ -357,7 +357,7 @@ 
 	/**
 	 * @return TBaseActiveCallbackControl standard callback control options.
 	 */
-	public function getActiveControl(){
+	public function getActiveControl() {
 		return $this->getAdapter()->getBaseActiveControl();
 	}
 
@@ -373,7 +373,7 @@ 
 	 * 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());
 
@@ -383,7 +383,7 @@ 
 	/**
 	 * @return string corresponding javascript class name for this control.
 	 */
-	protected function getClientClassName(){
+	protected function getClientClassName() {
 		return 'Prado.WebUI.TActiveFileUpload';
 	}
 
@@ -397,7 +397,7 @@ 
 	 * 					completeID => complete client ID,
 	 * 					errorID => error client ID)
 	 */
-	protected function getClientOptions(){
+	protected function getClientOptions() {
 		$options['ID'] = $this->getClientID();
 		$options['EventTarget'] = $this->getUniqueID();
 
@@ -419,8 +419,8 @@ 
 	 * 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)))){
+	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
@@ -433,7 +433,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		completes successfully.
 	 */
-	public function getSuccessImage(){
+	public function getSuccessImage() {
 		$this->ensureChildControls();
 		return $this->_success;
 	}
@@ -442,7 +442,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		does not complete successfully.
 	 */
-	public function getErrorImage(){
+	public function getErrorImage() {
 		$this->ensureChildControls();
 		return $this->_error;
 	}
@@ -451,7 +451,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		is in progress.
 	 */
-	public function getBusyImage(){
+	public function getBusyImage() {
 		$this->ensureChildControls();
 		return $this->_busy;
 	}

Braces +22 added lines, -20 removed lines

@@ -187,9 +187,10 @@ 
 	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()))){
 			throw new TInvalidDataValueException("activefileupload_temppath_invalid", $this->getTempPath());
@@ -239,14 +240,13 @@ 
 				// 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
-			}
-		elseif ($mgr = Prado::getApplication()->getSecurityManager())
+			} elseif ($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
-			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
+			} else {
+					throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
+		}
 
 		return $token;
 	}
@@ -259,14 +259,13 @@ 
 				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);
-			}
-		elseif ($mgr = Prado::getApplication()->getSecurityManager())
+			} elseif ($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				$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');
+			} else {
+					throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
+		}
 
 		assert($params instanceof TActiveFileUploadCallbackParams);
 
@@ -346,10 +345,11 @@ 
 	public function onUnload($param){
 		if ($this->getPage()->getIsCallback())
 		{
-		  foreach($this->getFiles() as $file)
-			if($file->getHasFile() && file_exists($file->getLocalName())){
+		  foreach($this->getFiles() as $file) {
+		  			if($file->getHasFile() && file_exists($file->getLocalName())){
 			  unlink($file->getLocalName());
 		  }
+		  }
 		}
 		parent::onUnload($param);
 	}
@@ -421,12 +421,14 @@ 
 	 */
 	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);
-		} else
-			return false;
+			if ($deleteTempFile) {
+							return rename($this->getLocalName($index), $fileName);
+			} else {
+							return copy($this->getLocalName($index), $fileName);
+			}
+		} else {
+					return false;
+		}
 	}
 
 	/**