pradosoft / prado

framework/Web/UI/ActiveControls/TScalarDiff.php

Braces +5 added lines, -4 removed lines

@@ -28,9 +28,10 @@
 	public function getDifference()
 	{
 		if(gettype($this->_new) === gettype($this->_old)
-			&& $this->_new === $this->_old)
-			return $this->_null;
-		else
-			return $this->_new;
+			&& $this->_new === $this->_old) {
+					return $this->_null;
+		} else {
+					return $this->_new;
+		}
 	}
 }

framework/Web/UI/ActiveControls/TActiveFileUpload.php

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;
+		}
 	}
 
 	/**

framework/Web/UI/ActiveControls/TActiveLiteralColumn.php

Braces +10 added lines, -13 removed lines

@@ -53,8 +53,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		elseif($this->getAllowSorting()) {
+		} elseif($this->getAllowSorting()) {
 				$sortExpression = $this->getSortExpression();
 				if(($url = $this->getHeaderImageUrl()) !== '') {
 					$button = new TActiveImageButton;
@@ -67,19 +66,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);
@@ -88,11 +85,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/TActiveListItemCollection.php

Braces +6 added lines, -4 removed lines

@@ -94,8 +94,9 @@ 
 	public function insertAt($index, $value)
 	{
 		parent::insertAt($index, $value);
-		if($this->canUpdateClientSide())
-			$this->_hasChanged = true;
+		if($this->canUpdateClientSide()) {
+					$this->_hasChanged = true;
+		}
 	}
 
 	/**
@@ -105,7 +106,8 @@ 
 	public function removeAt($index)
 	{
 		parent::removeAt($index);
-		if($this->canUpdateClientSide())
-			$this->_hasChanged = true;
+		if($this->canUpdateClientSide()) {
+					$this->_hasChanged = true;
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveListControlAdapter.php

Braces +27 added lines, -18 removed lines

@@ -50,14 +50,17 @@ 
 			// if a prompt is set, we mimic the postback behaviour of not counting it
 			// in the index. We assume the prompt is _always_ the first item (Issue #368)
 			$promptValue = $this->getControl()->getPromptValue();
-			if($promptValue === '')
-				$promptValue = $this->getControl()->getPromptText();
-			if($promptValue !== '')
-				$index++;
+			if($promptValue === '') {
+							$promptValue = $this->getControl()->getPromptText();
+			}
+			if($promptValue !== '') {
+							$index++;
+			}
 
-			if($index >= 0 && $index <= $this->getControl()->getItemCount())
-			$this->getPage()->getCallbackClient()->select(
+			if($index >= 0 && $index <= $this->getControl()->getItemCount()) {
+						$this->getPage()->getCallbackClient()->select(
 					$this->getControl(), 'Index', $index);
+			}
 		}
 	}
 
@@ -73,21 +76,25 @@ 
 			$n = $this->getControl()->getItemCount();
 
 			$promptValue = $this->getControl()->getPromptValue();
-			if($promptValue === '')
-				$promptValue = $this->getControl()->getPromptText();
+			if($promptValue === '') {
+							$promptValue = $this->getControl()->getPromptText();
+			}
 
 			$list = [];
 			foreach($indices as $index)
 			{
 				$index = intval($index);
-				if($promptValue !== '')
-					$index++;
-				if($index >= 0 && $index <= $n)
-					$list[] = $index;
+				if($promptValue !== '') {
+									$index++;
+				}
+				if($index >= 0 && $index <= $n) {
+									$list[] = $index;
+				}
 			}
-			if(count($list) > 0)
-				$this->getPage()->getCallbackClient()->select(
+			if(count($list) > 0) {
+							$this->getPage()->getCallbackClient()->select(
 					$this->getControl(), 'Indices', $list);
+			}
 		}
 	}
 
@@ -115,11 +122,13 @@ 
 		{
 			$this->updateListItems();
 			$list = [];
-			foreach($values as $value)
-				$list[] = $value;
-			if(count($list) > 0)
-				$this->getPage()->getCallbackClient()->select(
+			foreach($values as $value) {
+							$list[] = $value;
+			}
+			if(count($list) > 0) {
+							$this->getPage()->getCallbackClient()->select(
 					$this->getControl(), 'Values', $list);
+			}
 		}
 	}
 

framework/Web/UI/ActiveControls/TActiveDataList.php

Braces +4 added lines, -3 removed lines

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

framework/Web/UI/ActiveControls/TActiveHtmlArea.php

Braces +2 added lines, -2 removed lines

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

framework/Web/UI/ActiveControls/TInPlaceTextBox.php

Braces +24 added lines, -17 removed lines

@@ -82,8 +82,9 @@ 
 	{
 		$value = TPropertyValue::ensureBoolean($value);
 		$this->setViewState('DisplayTextBox', $value, false);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->callClientFunction('setDisplayTextBox', $value);
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->callClientFunction('setDisplayTextBox', $value);
+		}
 	}
 
 	/**
@@ -128,9 +129,12 @@ 
 	protected function getExternalControlID()
 	{
 		$extID = $this->getEditTriggerControlID();
-		if($extID === null) return '';
-		if(($control = $this->findControl($extID)) !== null)
-			return $control->getClientID();
+		if($extID === null) {
+			return '';
+		}
+		if(($control = $this->findControl($extID)) !== null) {
+					return $control->getClientID();
+		}
 		return $extID;
 	}
 
@@ -141,8 +145,9 @@ 
 	 */
 	public function setText($value)
 	{
-		if(TTextBox::getText() === $value)
-			return;
+		if(TTextBox::getText() === $value) {
+					return;
+		}
 
 		TTextBox::setText($value);
 		if($this->getActiveControl()->canUpdateClientSide())
@@ -161,8 +166,9 @@ 
 	public function setReadOnly ($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if(TTextBox::getReadOnly() === $value)
-			return;
+		if(TTextBox::getReadOnly() === $value) {
+					return;
+		}
 
 		TTextBox::setReadOnly($value);
 		if ($this->getActiveControl()->canUpdateClientSide())
@@ -185,10 +191,11 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) === '')
-			parent::renderContents($writer);
-		else
-			$writer->write($text);
+		if(($text = $this->getText()) === '') {
+					parent::renderContents($writer);
+		} else {
+					$writer->write($text);
+		}
 	}
 
 	/**
@@ -233,15 +240,15 @@ 
 		{
 			$options['Rows'] = $this->getRows();
 			$options['Wrap'] = $this->getWrap() == false ? '' : true;
-		}
-		else
+		} else
 		{
 			$length = $this->getMaxLength();
 			$options['MaxLength'] = $length > 0 ? $length : '';
 		}
 
-		if($this->hasEventHandler('OnLoadingText'))
-			$options['LoadTextOnEdit'] = true;
+		if($this->hasEventHandler('OnLoadingText')) {
+					$options['LoadTextOnEdit'] = true;
+		}
 
 		$options['ReadOnly'] = $this->getReadOnly();
 		return $options;

framework/Web/UI/ActiveControls/TActiveRepeater.php

Braces +4 added lines, -3 removed lines

@@ -100,9 +100,10 @@
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
-		}
-		else {
+			if($this->getActiveControl()->canUpdateClientSide()) {
+				$this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
+			}
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}