pradosoft / prado

framework/Web/UI/ActiveControls/TActiveDataGridPager.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	 */
 	public function getClientSide()
 	{
-		if($this->_callbackoptions === null)
+		if ($this->_callbackoptions === null)
 			$this->_callbackoptions = new TCallbackOptions;
 		return $this->_callbackoptions->getClientSide();
 	}

Braces +3 added lines, -2 removed lines

@@ -31,8 +31,9 @@
 	 */
 	public function getClientSide()
 	{
-		if($this->_callbackoptions === null)
-			$this->_callbackoptions = new TCallbackOptions;
+		if($this->_callbackoptions === null) {
+					$this->_callbackoptions = new TCallbackOptions;
+		}
 		return $this->_callbackoptions->getClientSide();
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveCheckBoxList.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 	 * updated later.
 	 *@return boolean always true
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
 	  return true;
 	}
@@ -126,7 +126,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if($this->getEnableClientScript()
+		if ($this->getEnableClientScript()
 			&& $this->getAutoPostBack()
 			&& $this->getPage()->getClientSupportsJavaScript())
 		{

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/TActiveTableCell.php

Braces +18 added lines, -12 removed lines

@@ -129,8 +129,9 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->hasEventHandler('OnCellSelected'))
-			$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
+		if ($this->hasEventHandler('OnCellSelected')) {
+					$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
+		}
 	}
 
 	/**
@@ -145,17 +146,18 @@ 
 		if ($this->getHasPreRendered())
 		{
 			parent::render($writer);
-			if ($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else {
+			if ($this->getActiveControl()->canUpdateClientSide()) {
+							$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
+			}
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableCell on callback, we shouldn't update all childs,
 			// because the whole content will be replaced by the parent.
 			if ($this->getHasControls())
 			{
-				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
-					$control->getActiveControl()->setEnableUpdate(false);
+				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control) {
+									$control->getActiveControl()->setEnableUpdate(false);
+				}
 			}
 		}
 	}
@@ -180,8 +182,9 @@ 
 	 */
 	public function getCellIndex()
 	{
-		foreach ($this->getRow()->getCells() as $key => $row)
-			if ($row == $this) return $key;
+		foreach ($this->getRow()->getCells() as $key => $row) {
+					if ($row == $this) return $key;
+		}
 		throw new TConfigurationException('tactivetablecell_control_notincollection', get_class($this), $this->getUniqueID());
 	}
 
@@ -199,8 +202,11 @@ 
 			{
 				$row = $row->getParent();
 			}
-			if ($row instanceof TTableRow) $this->_row = $row;
-			else throw new TConfigurationException('tactivetablecell_control_outoftable', get_class($this), $this->getUniqueID());
+			if ($row instanceof TTableRow) {
+				$this->_row = $row;
+			} else {
+				throw new TConfigurationException('tactivetablecell_control_outoftable', get_class($this), $this->getUniqueID());
+			}
 		}
 		return $this->_row;
 	}

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/TActiveMultiView.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
 	 */
 	protected function getContainerID()
 	{
-		return $this->ClientID . '_Container';
+		return $this->ClientID.'_Container';
 	}
 
 	/**
@@ -68,9 +68,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasPreRendered()) {
+		if ($this->getHasPreRendered()) {
 			$this->renderMultiView($writer);
-			if($this->getActiveControl()->canUpdateClientSide())
+			if ($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
 		}
 		else
@@ -97,7 +97,7 @@ 
 	public function setActiveViewIndex($value)
 	{
 		parent::setActiveViewIndex($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 	}
 
@@ -108,7 +108,7 @@ 
 	public function setActiveView($value)
 	{
 		parent::setActiveView($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 	}
 }

Braces +11 added lines, -8 removed lines

@@ -70,11 +70,12 @@ 
 	{
 		if($this->getHasPreRendered()) {
 			$this->renderMultiView($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);
 		}
-		else
-			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 	}
 
 	/**
@@ -97,8 +98,9 @@ 
 	public function setActiveViewIndex($value)
 	{
 		parent::setActiveViewIndex($value);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
+		}
 	}
 
 	/**
@@ -108,7 +110,8 @@ 
 	public function setActiveView($value)
 	{
 		parent::setActiveView($value);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
+		}
 	}
 }

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/TCallbackResponseWriter.php

Spacing +2 added lines, -2 removed lines

@@ -68,8 +68,8 @@
 	public function flush()
 	{
 		$content = parent::flush();
-		if(empty($content))
+		if (empty($content))
 			return "";
-		return '<!--' . $this->getBoundary() . '-->' . $content . '<!--//' . $this->getBoundary() . '-->';
+		return '<!--'.$this->getBoundary().'-->'.$content.'<!--//'.$this->getBoundary().'-->';
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -68,8 +68,9 @@
 	public function flush()
 	{
 		$content = parent::flush();
-		if(empty($content))
-			return "";
+		if(empty($content)) {
+					return "";
+		}
 		return '<!--' . $this->getBoundary() . '-->' . $content . '<!--//' . $this->getBoundary() . '-->';
 	}
 }