pradosoft / prado

framework/Web/UI/WebControls/TButton.php

Spacing +8 added lines, -8 removed lines

@@ -105,18 +105,18 @@ 
 		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
 		$writer->addAttribute('type', strtolower($this->getButtonType()));
-		if(($uniqueID = $this->getUniqueID()) !== '')
+		if (($uniqueID = $this->getUniqueID()) !== '')
 			$writer->addAttribute('name', $uniqueID);
-		if($this->getButtonTag() === TButtonTag::Button)
+		if ($this->getButtonTag() === TButtonTag::Button)
 		  $this->addParsedObject($this->getText());
 		else
 		  $writer->addAttribute('value', $this->getText());
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 		{
-			if($this->getEnableClientScript() && $this->needPostBackScript())
+			if ($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
 		}
-		elseif($this->getEnabled()) // in this case, parent will not render 'disabled'
+		elseif ($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
 
 		parent::addAttributesToRender($writer);
@@ -146,7 +146,7 @@ 
 	 */
 	protected function canCauseValidation()
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
@@ -204,7 +204,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getButtonTag() === TButtonTag::Button)
+		if ($this->getButtonTag() === TButtonTag::Button)
 			parent::renderContents($writer);
 	}
 
@@ -244,7 +244,7 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onClick(null);
 		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));

Braces +22 added lines, -16 removed lines

@@ -105,19 +105,23 @@ 
 		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
 		$writer->addAttribute('type', strtolower($this->getButtonType()));
-		if(($uniqueID = $this->getUniqueID()) !== '')
-			$writer->addAttribute('name', $uniqueID);
-		if($this->getButtonTag() === TButtonTag::Button)
-		  $this->addParsedObject($this->getText());
-		else
-		  $writer->addAttribute('value', $this->getText());
+		if(($uniqueID = $this->getUniqueID()) !== '') {
+					$writer->addAttribute('name', $uniqueID);
+		}
+		if($this->getButtonTag() === TButtonTag::Button) {
+				  $this->addParsedObject($this->getText());
+		} else {
+				  $writer->addAttribute('value', $this->getText());
+		}
 		if($this->getEnabled(true))
 		{
-			if($this->getEnableClientScript() && $this->needPostBackScript())
-				$this->renderClientControlScript($writer);
-		}
-		elseif($this->getEnabled()) // in this case, parent will not render 'disabled'
+			if($this->getEnableClientScript() && $this->needPostBackScript()) {
+							$this->renderClientControlScript($writer);
+			}
+		} elseif($this->getEnabled()) {
+			// in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
+		}
 
 		parent::addAttributesToRender($writer);
 	}
@@ -150,9 +154,9 @@ 
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -204,8 +208,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getButtonTag() === TButtonTag::Button)
-			parent::renderContents($writer);
+		if($this->getButtonTag() === TButtonTag::Button) {
+					parent::renderContents($writer);
+		}
 	}
 
 	/**
@@ -244,8 +249,9 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onClick(null);
 		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}

framework/Web/UI/WebControls/TMetaTagCollection.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TMetaTag)
+		if ($item instanceof TMetaTag)
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('metatagcollection_metatag_invalid');
@@ -49,9 +49,9 @@ 
 	public function findIndexByID($id)
 	{
 		$index = 0;
-		foreach($this as $item)
+		foreach ($this as $item)
 		{
-			if($item->getID() === $id)
+			if ($item->getID() === $id)
 				return $index;
 			$index++;
 		}
@@ -65,7 +65,7 @@ 
 	 */
 	public function findMetaTagByID($id)
 	{
-		if(($index = $this->findIndexByID($id)) >= 0)
+		if (($index = $this->findIndexByID($id)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;

Braces +13 added lines, -10 removed lines

@@ -35,10 +35,11 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TMetaTag)
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('metatagcollection_metatag_invalid');
+		if($item instanceof TMetaTag) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('metatagcollection_metatag_invalid');
+		}
 	}
 
 	/**
@@ -51,8 +52,9 @@ 
 		$index = 0;
 		foreach($this as $item)
 		{
-			if($item->getID() === $id)
-				return $index;
+			if($item->getID() === $id) {
+							return $index;
+			}
 			$index++;
 		}
 		return -1;
@@ -65,9 +67,10 @@ 
 	 */
 	public function findMetaTagByID($id)
 	{
-		if(($index = $this->findIndexByID($id)) >= 0)
-			return $this->itemAt($index);
-		else
-			return null;
+		if(($index = $this->findIndexByID($id)) >= 0) {
+					return $this->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TBoundColumn.php

Spacing +11 added lines, -11 removed lines

@@ -164,15 +164,15 @@ 
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		$item = $cell->getParent();
-		switch($itemType)
+		switch ($itemType)
 		{
 			case TListItemType::Item:
 			case TListItemType::AlternatingItem:
 			case TListItemType::SelectedItem:
-				if(($classPath = $this->getItemRenderer()) !== '')
+				if (($classPath = $this->getItemRenderer()) !== '')
 				{
 					$control = Prado::createComponent($classPath);
-					if($control instanceof IItemDataRenderer)
+					if ($control instanceof IItemDataRenderer)
 					{
 						$control->setItemIndex($item->getItemIndex());
 						$control->setItemType($item->getItemType());
@@ -181,15 +181,15 @@ 
 				}
 				else
 					$control = $cell;
-				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				$control->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 				break;
 			case TListItemType::EditItem:
-				if(!$this->getReadOnly())
+				if (!$this->getReadOnly())
 				{
-					if(($classPath = $this->getEditItemRenderer()) !== '')
+					if (($classPath = $this->getEditItemRenderer()) !== '')
 					{
 						$control = Prado::createComponent($classPath);
-						if($control instanceof IItemDataRenderer)
+						if ($control instanceof IItemDataRenderer)
 						{
 							$control->setItemIndex($item->getItemIndex());
 							$control->setItemType($item->getItemType());
@@ -206,10 +206,10 @@ 
 				}
 				else
 				{
-					if(($classPath = $this->getItemRenderer()) !== '')
+					if (($classPath = $this->getItemRenderer()) !== '')
 					{
 						$control = Prado::createComponent($classPath);
-						if($control instanceof IItemDataRenderer)
+						if ($control instanceof IItemDataRenderer)
 						{
 							$control->setItemIndex($item->getItemIndex());
 							$control->setItemType($item->getItemType());
@@ -219,7 +219,7 @@ 
 					else
 						$control = $cell;
 				}
-				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				$control->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 				break;
 			default:
 				parent::initializeCell($cell, $columnIndex, $itemType);
@@ -237,7 +237,7 @@ 
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
 		$formatString = $this->getDataFormatString();
-		if(($field = $this->getDataField()) !== '')
+		if (($field = $this->getDataField()) !== '')
 			$value = $this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
 		else
 			$value = $this->formatDataValue($formatString, $data);

Braces +11 added lines, -12 removed lines

@@ -178,9 +178,9 @@ 
 						$control->setItemType($item->getItemType());
 					}
 					$cell->getControls()->add($control);
+				} else {
+									$control = $cell;
 				}
-				else
-					$control = $cell;
 				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
 				break;
 			case TListItemType::EditItem:
@@ -196,15 +196,13 @@ 
 						}
 						$cell->getControls()->add($control);
 						$cell->registerObject('EditControl', $control);
-					}
-					else
+					} else
 					{
 						$control = new TTextBox;
 						$cell->getControls()->add($control);
 						$cell->registerObject('TextBox', $control);
 					}
-				}
-				else
+				} else
 				{
 					if(($classPath = $this->getItemRenderer()) !== '')
 					{
@@ -215,9 +213,9 @@ 
 							$control->setItemType($item->getItemType());
 						}
 						$cell->getControls()->add($control);
+					} else {
+											$control = $cell;
 					}
-					else
-						$control = $cell;
 				}
 				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
 				break;
@@ -237,10 +235,11 @@ 
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
 		$formatString = $this->getDataFormatString();
-		if(($field = $this->getDataField()) !== '')
-			$value = $this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
-		else
-			$value = $this->formatDataValue($formatString, $data);
+		if(($field = $this->getDataField()) !== '') {
+					$value = $this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
+		} else {
+					$value = $this->formatDataValue($formatString, $data);
+		}
 		$sender->setData($value);
 	}
 }

framework/Web/UI/WebControls/TExpression.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	 */
 	public function render($writer)
 	{
-		if($this->_e !== '')
+		if ($this->_e !== '')
 			$writer->write($this->evaluateExpression($this->_e));
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -55,8 +55,9 @@
 	 */
 	public function render($writer)
 	{
-		if($this->_e !== '')
-			$writer->write($this->evaluateExpression($this->_e));
+		if($this->_e !== '') {
+					$writer->write($this->evaluateExpression($this->_e));
+		}
 	}
 }
 

framework/Web/UI/WebControls/TReCaptcha2.php

Spacing +5 added lines, -5 removed lines

@@ -115,7 +115,7 @@ 
 		{
 			if ($this->getClientID() == $captcha->ClientID)
 			{
-				$responseFieldName .= ($cont > 0) ? '-' . $cont : '';
+				$responseFieldName .= ($cont > 0) ? '-'.$cont : '';
 			}
 			$cont++;
 		}
@@ -292,7 +292,7 @@ 
 	public function validate()
 	{
 		$value = $this->getValidationPropertyValue();
-		if($value === null || empty($value))
+		if ($value === null || empty($value))
 			return false;
 
 		return true;
@@ -305,14 +305,14 @@ 
 	{
 		parent::onPreRender($param);
 
-		if("" == $this->getSiteKey())
+		if ("" == $this->getSiteKey())
 			throw new TConfigurationException('recaptcha_publickey_unknown');
-		if("" == $this->getSecretKey())
+		if ("" == $this->getSecretKey())
 			throw new TConfigurationException('recaptcha_privatekey_unknown');
 
 		// need to register captcha fields so they will be sent postback
 		$this->Page->registerRequiresPostData($this->getResponseFieldName());
-		$this->Page->ClientScript->registerHeadScriptFile('grecaptcha2', 'https://www.google.com/recaptcha/api.js?onload=TReCaptcha2_onloadCallback&render=explicit&hl=' . $this->getLanguage());
+		$this->Page->ClientScript->registerHeadScriptFile('grecaptcha2', 'https://www.google.com/recaptcha/api.js?onload=TReCaptcha2_onloadCallback&render=explicit&hl='.$this->getLanguage());
 	}
 	protected function addAttributesToRender($writer)
 	{

Braces +21 added lines, -10 removed lines

@@ -271,10 +271,18 @@ 
 		$options['onCallback'] = $this->hasEventHandler('OnCallback');
 		$options['onCallbackExpired'] = $this->hasEventHandler('OnCallbackExpired');
 		$options['options']['sitekey'] = $this->getSiteKey();
-		if ($theme = $this->getTheme()) $options['options']['theme'] = $theme;
-		if ($type = $this->getType()) $options['options']['type'] = $type;
-		if ($size = $this->getSize()) $options['options']['size'] = $size;
-		if ($tabIndex = $this->getTabIndex()) $options['options']['tabindex'] = $tabIndex;
+		if ($theme = $this->getTheme()) {
+			$options['options']['theme'] = $theme;
+		}
+		if ($type = $this->getType()) {
+			$options['options']['type'] = $type;
+		}
+		if ($size = $this->getSize()) {
+			$options['options']['size'] = $size;
+		}
+		if ($tabIndex = $this->getTabIndex()) {
+			$options['options']['tabindex'] = $tabIndex;
+		}
 
 		return $options;
 	}
@@ -292,8 +300,9 @@ 
 	public function validate()
 	{
 		$value = $this->getValidationPropertyValue();
-		if($value === null || empty($value))
-			return false;
+		if($value === null || empty($value)) {
+					return false;
+		}
 
 		return true;
 	}
@@ -305,10 +314,12 @@ 
 	{
 		parent::onPreRender($param);
 
-		if("" == $this->getSiteKey())
-			throw new TConfigurationException('recaptcha_publickey_unknown');
-		if("" == $this->getSecretKey())
-			throw new TConfigurationException('recaptcha_privatekey_unknown');
+		if("" == $this->getSiteKey()) {
+					throw new TConfigurationException('recaptcha_publickey_unknown');
+		}
+		if("" == $this->getSecretKey()) {
+					throw new TConfigurationException('recaptcha_privatekey_unknown');
+		}
 
 		// need to register captcha fields so they will be sent postback
 		$this->Page->registerRequiresPostData($this->getResponseFieldName());

framework/Web/UI/WebControls/THead.php

Spacing +10 added lines, -10 removed lines

@@ -73,7 +73,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TMetaTag)
+		if ($object instanceof TMetaTag)
 			$this->getMetaTags()->add($object);
 		else
 			parent::addParsedObject($object);
@@ -135,7 +135,7 @@ 
 	 */
 	public function getMetaTags()
 	{
-		if(($metaTags = $this->getViewState('MetaTags', null)) === null)
+		if (($metaTags = $this->getViewState('MetaTags', null)) === null)
 		{
 			$metaTags = new TMetaTagCollection;
 			$this->setViewState('MetaTags', $metaTags, null);
@@ -151,15 +151,15 @@ 
 	{
 		$page = $this->getPage();
 		$title = $this->getTitle();
-		$writer->write("<head>\n<title>" . THttpUtility::htmlEncode($title) . "</title>\n");
-		if(($baseUrl = $this->getBaseUrl()) !== '')
-			$writer->write('<base href="' . $baseUrl . "\" />\n");
-		if(($icon = $this->getShortcutIcon()) !== '')
-			$writer->write('<link rel="shortcut icon" href="' . $icon . "\" />\n");
+		$writer->write("<head>\n<title>".THttpUtility::htmlEncode($title)."</title>\n");
+		if (($baseUrl = $this->getBaseUrl()) !== '')
+			$writer->write('<base href="'.$baseUrl."\" />\n");
+		if (($icon = $this->getShortcutIcon()) !== '')
+			$writer->write('<link rel="shortcut icon" href="'.$icon."\" />\n");
 
-		if(($metaTags = $this->getMetaTags()) !== null)
+		if (($metaTags = $this->getMetaTags()) !== null)
 		{
-			foreach($metaTags as $metaTag)
+			foreach ($metaTags as $metaTag)
 			{
 				$metaTag->render($writer);
 				$writer->writeLine();
@@ -168,7 +168,7 @@ 
 		$cs = $page->getClientScript();
 		$cs->renderStyleSheetFiles($writer);
 		$cs->renderStyleSheets($writer);
-		if($page->getClientSupportsJavaScript())
+		if ($page->getClientSupportsJavaScript())
 		{
 			$cs->renderHeadScriptFiles($writer);
 			$cs->renderHeadScripts($writer);

Braces +11 added lines, -8 removed lines

@@ -73,10 +73,11 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TMetaTag)
-			$this->getMetaTags()->add($object);
-		else
-			parent::addParsedObject($object);
+		if($object instanceof TMetaTag) {
+					$this->getMetaTags()->add($object);
+		} else {
+					parent::addParsedObject($object);
+		}
 	}
 
 	/**
@@ -152,10 +153,12 @@ 
 		$page = $this->getPage();
 		$title = $this->getTitle();
 		$writer->write("<head>\n<title>" . THttpUtility::htmlEncode($title) . "</title>\n");
-		if(($baseUrl = $this->getBaseUrl()) !== '')
-			$writer->write('<base href="' . $baseUrl . "\" />\n");
-		if(($icon = $this->getShortcutIcon()) !== '')
-			$writer->write('<link rel="shortcut icon" href="' . $icon . "\" />\n");
+		if(($baseUrl = $this->getBaseUrl()) !== '') {
+					$writer->write('<base href="' . $baseUrl . "\" />\n");
+		}
+		if(($icon = $this->getShortcutIcon()) !== '') {
+					$writer->write('<link rel="shortcut icon" href="' . $icon . "\" />\n");
+		}
 
 		if(($metaTags = $this->getMetaTags()) !== null)
 		{

framework/Web/UI/WebControls/TContent.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	 */
 	public function createdOnTemplate($parent)
 	{
-		if(($id = $this->getID()) === '')
+		if (($id = $this->getID()) === '')
 			throw new TConfigurationException('content_id_required');
 		$this->getTemplateControl()->registerContent($id, $this);
 	}

Braces +3 added lines, -2 removed lines

@@ -43,8 +43,9 @@
 	 */
 	public function createdOnTemplate($parent)
 	{
-		if(($id = $this->getID()) === '')
-			throw new TConfigurationException('content_id_required');
+		if(($id = $this->getID()) === '') {
+					throw new TConfigurationException('content_id_required');
+		}
 		$this->getTemplateControl()->registerContent($id, $this);
 	}
 }

framework/Web/UI/WebControls/THiddenField.php

Spacing +6 added lines, -6 removed lines

@@ -59,16 +59,16 @@ 
 		$uniqueID = $this->getUniqueID();
 		$this->getPage()->ensureRenderInForm($this);
 		$writer->addAttribute('type', 'hidden');
-		if($uniqueID !== '')
+		if ($uniqueID !== '')
 			$writer->addAttribute('name', $uniqueID);
-		if($this->getID() !== '')
+		if ($this->getID() !== '')
 			$writer->addAttribute('id', $this->getClientID());
-		if(($value = $this->getValue()) !== '')
+		if (($value = $this->getValue()) !== '')
 			$writer->addAttribute('value', $value);
 
-		if($this->getHasAttributes())
+		if ($this->getHasAttributes())
 		{
-			foreach($this->getAttributes() as $name => $value)
+			foreach ($this->getAttributes() as $name => $value)
 				$writer->addAttribute($name, $value);
 		}
 
@@ -86,7 +86,7 @@ 
 	public function loadPostData($key, $values)
 	{
 		$value = $values[$key];
-		if($value === $this->getValue())
+		if ($value === $this->getValue())
 			return false;
 		else
 		{

Braces +15 added lines, -11 removed lines

@@ -59,17 +59,21 @@ 
 		$uniqueID = $this->getUniqueID();
 		$this->getPage()->ensureRenderInForm($this);
 		$writer->addAttribute('type', 'hidden');
-		if($uniqueID !== '')
-			$writer->addAttribute('name', $uniqueID);
-		if($this->getID() !== '')
-			$writer->addAttribute('id', $this->getClientID());
-		if(($value = $this->getValue()) !== '')
-			$writer->addAttribute('value', $value);
+		if($uniqueID !== '') {
+					$writer->addAttribute('name', $uniqueID);
+		}
+		if($this->getID() !== '') {
+					$writer->addAttribute('id', $this->getClientID());
+		}
+		if(($value = $this->getValue()) !== '') {
+					$writer->addAttribute('value', $value);
+		}
 
 		if($this->getHasAttributes())
 		{
-			foreach($this->getAttributes() as $name => $value)
-				$writer->addAttribute($name, $value);
+			foreach($this->getAttributes() as $name => $value) {
+							$writer->addAttribute($name, $value);
+			}
 		}
 
 		$writer->renderBeginTag('input');
@@ -86,9 +90,9 @@ 
 	public function loadPostData($key, $values)
 	{
 		$value = $values[$key];
-		if($value === $this->getValue())
-			return false;
-		else
+		if($value === $this->getValue()) {
+					return false;
+		} else
 		{
 			$this->setValue($value);
 			return $this->_dataChanged = true;

framework/Web/UI/WebControls/TRegularExpressionValidator.php

Spacing +2 added lines, -2 removed lines

@@ -79,9 +79,9 @@
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
+		if (($value = $this->getValidationValue($this->getValidationTarget())) === '')
 			return true;
-		if(($expression = addcslashes($this->getRegularExpression(), "/")) !== '')
+		if (($expression = addcslashes($this->getRegularExpression(), "/")) !== '')
 		{
 			$mods = $this->getPatternModifiers();
 			return preg_match("/^$expression\$/{$mods}", $value);

Braces +5 added lines, -4 removed lines

@@ -79,15 +79,16 @@
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
-			return true;
+		if(($value = $this->getValidationValue($this->getValidationTarget())) === '') {
+					return true;
+		}
 		if(($expression = addcslashes($this->getRegularExpression(), "/")) !== '')
 		{
 			$mods = $this->getPatternModifiers();
 			return preg_match("/^$expression\$/{$mods}", $value);
+		} else {
+					return true;
 		}
-		else
-			return true;
 	}
 
 	/**