pradosoft / prado

framework/Web/UI/WebControls/TCaptcha.php

Spacing +33 added lines, -33 removed lines

@@ -93,7 +93,7 @@ 
 	public function setTokenImageTheme($value)
 	{
 		$value = TPropertyValue::ensureInteger($value);
-		if($value >= 0 && $value <= 63)
+		if ($value >= 0 && $value <= 63)
 			$this->setViewState('TokenImageTheme', $value, 0);
 		else
 			throw new TConfigurationException('captcha_tokenimagetheme_invalid', 0, 63);
@@ -116,7 +116,7 @@ 
 	public function setTokenFontSize($value)
 	{
 		$value = TPropertyValue::ensureInteger($value);
-		if($value >= 20 && $value <= 100)
+		if ($value >= 20 && $value <= 100)
 			$this->setViewState('TokenFontSize', $value, 30);
 		else
 			throw new TConfigurationException('captcha_tokenfontsize_invalid', 20, 100);
@@ -136,7 +136,7 @@ 
 	public function setMinTokenLength($value)
 	{
 		$length = TPropertyValue::ensureInteger($value);
-		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
+		if ($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
 			$this->setViewState('MinTokenLength', $length, 4);
 		else
 			throw new TConfigurationException('captcha_mintokenlength_invalid', self::MIN_TOKEN_LENGTH, self::MAX_TOKEN_LENGTH);
@@ -156,7 +156,7 @@ 
 	public function setMaxTokenLength($value)
 	{
 		$length = TPropertyValue::ensureInteger($value);
-		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
+		if ($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
 			$this->setViewState('MaxTokenLength', $length, 6);
 		else
 			throw new TConfigurationException('captcha_maxtokenlength_invalid', self::MIN_TOKEN_LENGTH, self::MAX_TOKEN_LENGTH);
@@ -191,7 +191,7 @@ 
 	 */
 	public function setTokenAlphabet($value)
 	{
-		if(strlen($value) < 2)
+		if (strlen($value) < 2)
 			throw new TConfigurationException('captcha_tokenalphabet_invalid');
 		$this->setViewState('TokenAlphabet', $value, '234578adefhijmnrtABDEFGHJLMNRT');
 	}
@@ -249,7 +249,7 @@ 
 	 */
 	public function getIsTokenExpired()
 	{
-		if(($expiry = $this->getTokenExpiry()) > 0 && ($start = $this->getViewState('TokenGenerated', 0)) > 0)
+		if (($expiry = $this->getTokenExpiry()) > 0 && ($start = $this->getViewState('TokenGenerated', 0)) > 0)
 			return $expiry + $start < time();
 		else
 			return false;
@@ -260,7 +260,7 @@ 
 	 */
 	public function getPublicKey()
 	{
-		if(($publicKey = $this->getViewState('PublicKey', '')) === '')
+		if (($publicKey = $this->getViewState('PublicKey', '')) === '')
 		{
 			$publicKey = $this->generateRandomKey();
 			$this->setPublicKey($publicKey);
@@ -289,13 +289,13 @@ 
 	 */
 	protected function getTokenLength()
 	{
-		if(($tokenLength = $this->getViewState('TokenLength')) === null)
+		if (($tokenLength = $this->getViewState('TokenLength')) === null)
 		{
 			$minLength = $this->getMinTokenLength();
 			$maxLength = $this->getMaxTokenLength();
-			if($minLength > $maxLength)
+			if ($minLength > $maxLength)
 				$tokenLength = rand($maxLength, $minLength);
-			elseif($minLength < $maxLength)
+			elseif ($minLength < $maxLength)
 				$tokenLength = rand($minLength, $maxLength);
 			else
 				$tokenLength = $minLength;
@@ -309,12 +309,12 @@ 
 	 */
 	public function getPrivateKey()
 	{
-		if($this->_privateKey === null)
+		if ($this->_privateKey === null)
 		{
 			$fileName = $this->generatePrivateKeyFile();
 			$content = file_get_contents($fileName);
 			$matches = [];
-			if(preg_match("/privateKey='(.*?)'/ms", $content, $matches) > 0)
+			if (preg_match("/privateKey='(.*?)'/ms", $content, $matches) > 0)
 				$this->_privateKey = $matches[1];
 			else
 				throw new TConfigurationException('captcha_privatekey_unknown');
@@ -330,17 +330,17 @@ 
 	public function validate($input)
 	{
 		$number = $this->getViewState('TestNumber', 0);
-		if(!$this->_validated)
+		if (!$this->_validated)
 		{
 			$this->setViewState('TestNumber', ++$number);
 			$this->_validated = true;
 		}
-		if($this->getIsTokenExpired() || (($limit = $this->getTestLimit()) > 0 && $number > $limit))
+		if ($this->getIsTokenExpired() || (($limit = $this->getTestLimit()) > 0 && $number > $limit))
 		{
 			$this->regenerateToken();
 			return false;
 		}
-		return ($this->getToken() === ($this->getCaseSensitive()?$input:strtoupper($input)));
+		return ($this->getToken() === ($this->getCaseSensitive() ? $input : strtoupper($input)));
 	}
 
 	/**
@@ -364,14 +364,14 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(!self::checkRequirements())
+		if (!self::checkRequirements())
 			throw new TConfigurationException('captcha_imagettftext_required');
-		if(!$this->getViewState('TokenGenerated', 0))
+		if (!$this->getViewState('TokenGenerated', 0))
 		{
 			$manager = $this->getApplication()->getAssetManager();
 			$manager->publishFilePath($this->getFontFile());
 			$url = $manager->publishFilePath($this->getCaptchaScriptFile());
-			$url .= '?options=' . urlencode($this->getTokenImageOptions());
+			$url .= '?options='.urlencode($this->getTokenImageOptions());
 			$this->setImageUrl($url);
 
 			$this->setViewState('TokenGenerated', time());
@@ -383,7 +383,7 @@ 
 	 */
 	protected function getTokenImageOptions()
 	{
-		$privateKey = $this->getPrivateKey();  // call this method to ensure private key is generated
+		$privateKey = $this->getPrivateKey(); // call this method to ensure private key is generated
 		$token = $this->getToken();
 		$options = [];
 		$options['publicKey'] = $this->getPublicKey();
@@ -392,14 +392,14 @@ 
 		$options['alphabet'] = $this->getTokenAlphabet();
 		$options['fontSize'] = $this->getTokenFontSize();
 		$options['theme'] = $this->getTokenImageTheme();
-		if(($randomSeed = $this->getViewState('RandomSeed', 0)) === 0)
+		if (($randomSeed = $this->getViewState('RandomSeed', 0)) === 0)
 		{
-			$randomSeed = (int)(microtime(true) * 1000000);
+			$randomSeed = (int) (microtime(true) * 1000000);
 			$this->setViewState('RandomSeed', $randomSeed);
 		}
-		$options['randomSeed'] = $this->getChangingTokenBackground()?0:$randomSeed;
+		$options['randomSeed'] = $this->getChangingTokenBackground() ? 0 : $randomSeed;
 		$str = serialize($options);
-		return base64_encode(md5($privateKey . $str) . $str);
+		return base64_encode(md5($privateKey.$str).$str);
 	}
 
 	/**
@@ -407,12 +407,12 @@ 
 	 */
 	protected function getCaptchaScriptFile()
 	{
-		return dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'captcha.php';
+		return dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'captcha.php';
 	}
 
 	protected function getFontFile()
 	{
-		return dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'verase.ttf';
+		return dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'verase.ttf';
 	}
 
 	/**
@@ -423,8 +423,8 @@ 
 	{
 		$captchaScript = $this->getCaptchaScriptFile();
 		$path = dirname($this->getApplication()->getAssetManager()->getPublishedPath($captchaScript));
-		$fileName = $path . DIRECTORY_SEPARATOR . 'captcha_key.php';
-		if(!is_file($fileName))
+		$fileName = $path.DIRECTORY_SEPARATOR.'captcha_key.php';
+		if (!is_file($fileName))
 		{
 			@mkdir($path);
 			$key = $this->generateRandomKey();
@@ -441,7 +441,7 @@ 
 	 */
 	protected function generateRandomKey()
 	{
-		return md5(rand() . rand() . rand() . rand());
+		return md5(rand().rand().rand().rand());
 	}
 
 	/**
@@ -454,8 +454,8 @@ 
 	 */
 	protected function generateToken($publicKey, $privateKey, $alphabet, $tokenLength, $caseSensitive)
 	{
-		$token = substr($this->hash2string(md5($publicKey . $privateKey), $alphabet) . $this->hash2string(md5($privateKey . $publicKey), $alphabet), 0, $tokenLength);
-		return $caseSensitive?$token:strtoupper($token);
+		$token = substr($this->hash2string(md5($publicKey.$privateKey), $alphabet).$this->hash2string(md5($privateKey.$publicKey), $alphabet), 0, $tokenLength);
+		return $caseSensitive ? $token : strtoupper($token);
 	}
 
 	/**
@@ -466,15 +466,15 @@ 
 	 */
 	protected function hash2string($hex, $alphabet = '')
 	{
-		if(strlen($alphabet) < 2)
+		if (strlen($alphabet) < 2)
 			$alphabet = '234578adefhijmnrtABDEFGHJLMNQRT';
 		$hexLength = strlen($hex);
 		$base = strlen($alphabet);
 		$result = '';
-		for($i = 0;$i < $hexLength;$i += 6)
+		for ($i = 0; $i < $hexLength; $i += 6)
 		{
 			$number = hexdec(substr($hex, $i, 6));
-			while($number)
+			while ($number)
 			{
 				$result .= $alphabet[$number % $base];
 				$number = floor($number / $base);

Braces +46 added lines, -36 removed lines

@@ -93,10 +93,11 @@ 
 	public function setTokenImageTheme($value)
 	{
 		$value = TPropertyValue::ensureInteger($value);
-		if($value >= 0 && $value <= 63)
-			$this->setViewState('TokenImageTheme', $value, 0);
-		else
-			throw new TConfigurationException('captcha_tokenimagetheme_invalid', 0, 63);
+		if($value >= 0 && $value <= 63) {
+					$this->setViewState('TokenImageTheme', $value, 0);
+		} else {
+					throw new TConfigurationException('captcha_tokenimagetheme_invalid', 0, 63);
+		}
 	}
 
 	/**
@@ -116,10 +117,11 @@ 
 	public function setTokenFontSize($value)
 	{
 		$value = TPropertyValue::ensureInteger($value);
-		if($value >= 20 && $value <= 100)
-			$this->setViewState('TokenFontSize', $value, 30);
-		else
-			throw new TConfigurationException('captcha_tokenfontsize_invalid', 20, 100);
+		if($value >= 20 && $value <= 100) {
+					$this->setViewState('TokenFontSize', $value, 30);
+		} else {
+					throw new TConfigurationException('captcha_tokenfontsize_invalid', 20, 100);
+		}
 	}
 
 	/**
@@ -136,10 +138,11 @@ 
 	public function setMinTokenLength($value)
 	{
 		$length = TPropertyValue::ensureInteger($value);
-		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
-			$this->setViewState('MinTokenLength', $length, 4);
-		else
-			throw new TConfigurationException('captcha_mintokenlength_invalid', self::MIN_TOKEN_LENGTH, self::MAX_TOKEN_LENGTH);
+		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH) {
+					$this->setViewState('MinTokenLength', $length, 4);
+		} else {
+					throw new TConfigurationException('captcha_mintokenlength_invalid', self::MIN_TOKEN_LENGTH, self::MAX_TOKEN_LENGTH);
+		}
 	}
 
 	/**
@@ -156,10 +159,11 @@ 
 	public function setMaxTokenLength($value)
 	{
 		$length = TPropertyValue::ensureInteger($value);
-		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
-			$this->setViewState('MaxTokenLength', $length, 6);
-		else
-			throw new TConfigurationException('captcha_maxtokenlength_invalid', self::MIN_TOKEN_LENGTH, self::MAX_TOKEN_LENGTH);
+		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH) {
+					$this->setViewState('MaxTokenLength', $length, 6);
+		} else {
+					throw new TConfigurationException('captcha_maxtokenlength_invalid', self::MIN_TOKEN_LENGTH, self::MAX_TOKEN_LENGTH);
+		}
 	}
 
 	/**
@@ -191,8 +195,9 @@ 
 	 */
 	public function setTokenAlphabet($value)
 	{
-		if(strlen($value) < 2)
-			throw new TConfigurationException('captcha_tokenalphabet_invalid');
+		if(strlen($value) < 2) {
+					throw new TConfigurationException('captcha_tokenalphabet_invalid');
+		}
 		$this->setViewState('TokenAlphabet', $value, '234578adefhijmnrtABDEFGHJLMNRT');
 	}
 
@@ -249,10 +254,11 @@ 
 	 */
 	public function getIsTokenExpired()
 	{
-		if(($expiry = $this->getTokenExpiry()) > 0 && ($start = $this->getViewState('TokenGenerated', 0)) > 0)
-			return $expiry + $start < time();
-		else
-			return false;
+		if(($expiry = $this->getTokenExpiry()) > 0 && ($start = $this->getViewState('TokenGenerated', 0)) > 0) {
+					return $expiry + $start < time();
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -293,12 +299,13 @@ 
 		{
 			$minLength = $this->getMinTokenLength();
 			$maxLength = $this->getMaxTokenLength();
-			if($minLength > $maxLength)
-				$tokenLength = rand($maxLength, $minLength);
-			elseif($minLength < $maxLength)
-				$tokenLength = rand($minLength, $maxLength);
-			else
-				$tokenLength = $minLength;
+			if($minLength > $maxLength) {
+							$tokenLength = rand($maxLength, $minLength);
+			} elseif($minLength < $maxLength) {
+							$tokenLength = rand($minLength, $maxLength);
+			} else {
+							$tokenLength = $minLength;
+			}
 			$this->setViewState('TokenLength', $tokenLength);
 		}
 		return $tokenLength;
@@ -314,10 +321,11 @@ 
 			$fileName = $this->generatePrivateKeyFile();
 			$content = file_get_contents($fileName);
 			$matches = [];
-			if(preg_match("/privateKey='(.*?)'/ms", $content, $matches) > 0)
-				$this->_privateKey = $matches[1];
-			else
-				throw new TConfigurationException('captcha_privatekey_unknown');
+			if(preg_match("/privateKey='(.*?)'/ms", $content, $matches) > 0) {
+							$this->_privateKey = $matches[1];
+			} else {
+							throw new TConfigurationException('captcha_privatekey_unknown');
+			}
 		}
 		return $this->_privateKey;
 	}
@@ -364,8 +372,9 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(!self::checkRequirements())
-			throw new TConfigurationException('captcha_imagettftext_required');
+		if(!self::checkRequirements()) {
+					throw new TConfigurationException('captcha_imagettftext_required');
+		}
 		if(!$this->getViewState('TokenGenerated', 0))
 		{
 			$manager = $this->getApplication()->getAssetManager();
@@ -466,8 +475,9 @@ 
 	 */
 	protected function hash2string($hex, $alphabet = '')
 	{
-		if(strlen($alphabet) < 2)
-			$alphabet = '234578adefhijmnrtABDEFGHJLMNQRT';
+		if(strlen($alphabet) < 2) {
+					$alphabet = '234578adefhijmnrtABDEFGHJLMNQRT';
+		}
 		$hexLength = strlen($hex);
 		$base = strlen($alphabet);
 		$result = '';

framework/Web/UI/WebControls/TTextBox.php

Spacing +30 added lines, -30 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	protected function getTagName()
 	{
-		return ($this->getTextMode() === 'MultiLine')?'textarea':'input';
+		return ($this->getTextMode() === 'MultiLine') ? 'textarea' : 'input';
 	}
 
 	/**
@@ -109,22 +109,22 @@ 
 	{
 		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
-		if(($uid = $this->getUniqueID()) !== '')
+		if (($uid = $this->getUniqueID()) !== '')
 			$writer->addAttribute('name', $uid);
-		if(($textMode = $this->getTextMode()) === TTextBoxMode::MultiLine)
+		if (($textMode = $this->getTextMode()) === TTextBoxMode::MultiLine)
 		{
-			if(($rows = $this->getRows()) <= 0)
+			if (($rows = $this->getRows()) <= 0)
 				$rows = self::DEFAULT_ROWS;
-			if(($cols = $this->getColumns()) <= 0)
+			if (($cols = $this->getColumns()) <= 0)
 				$cols = self::DEFAULT_COLUMNS;
 			$writer->addAttribute('rows', "$rows");
 			$writer->addAttribute('cols', "$cols");
-			if(!$this->getWrap())
+			if (!$this->getWrap())
 				$writer->addAttribute('wrap', 'off');
 		}
 		else
 		{
-			switch($textMode)
+			switch ($textMode)
 			{
 				case TTextBoxMode::Password:
 					$writer->addAttribute('type', 'password');
@@ -174,40 +174,40 @@ 
 					break;
 			}
 
-			if(($text = $this->getText()) !== '' && ($textMode !== TTextBoxMode::Password || $this->getPersistPassword()))
+			if (($text = $this->getText()) !== '' && ($textMode !== TTextBoxMode::Password || $this->getPersistPassword()))
 				$writer->addAttribute('value', $text);
 
-			if(($act = $this->getAutoCompleteType()) !== 'None')
+			if (($act = $this->getAutoCompleteType()) !== 'None')
 			{
-				if($act === 'Disabled')
+				if ($act === 'Disabled')
 					$writer->addAttribute('autocomplete', 'off');
-				elseif($act === 'Search')
+				elseif ($act === 'Search')
 					$writer->addAttribute('vcard_name', 'search');
-				elseif($act === 'HomeCountryRegion')
+				elseif ($act === 'HomeCountryRegion')
 					$writer->addAttribute('vcard_name', 'HomeCountry');
-				elseif($act === 'BusinessCountryRegion')
+				elseif ($act === 'BusinessCountryRegion')
 					$writer->addAttribute('vcard_name', 'BusinessCountry');
 				else
 				{
-					if(strpos($act, 'Business') === 0)
-						$act = 'Business' . '.' . substr($act, 8);
-					elseif(strpos($act, 'Home') === 0)
-						$act = 'Home' . '.' . substr($act, 4);
-					$writer->addAttribute('vcard_name', 'vCard.' . $act);
+					if (strpos($act, 'Business') === 0)
+						$act = 'Business'.'.'.substr($act, 8);
+					elseif (strpos($act, 'Home') === 0)
+						$act = 'Home'.'.'.substr($act, 4);
+					$writer->addAttribute('vcard_name', 'vCard.'.$act);
 				}
 			}
 
-			if(($cols = $this->getColumns()) > 0)
+			if (($cols = $this->getColumns()) > 0)
 				$writer->addAttribute('size', "$cols");
-			if(($maxLength = $this->getMaxLength()) > 0)
+			if (($maxLength = $this->getMaxLength()) > 0)
 				$writer->addAttribute('maxlength', "$maxLength");
 		}
-		if($this->getReadOnly())
+		if ($this->getReadOnly())
 			$writer->addAttribute('readonly', 'readonly');
 		$isEnabled = $this->getEnabled(true);
-		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
+		if (!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
-		if($isEnabled
+		if ($isEnabled
 			&& $this->getEnableClientScript()
 			&& ($this->getAutoPostBack() || $textMode === TTextBoxMode::SingleLine)
 			&& $page->getClientSupportsJavaScript())
@@ -262,9 +262,9 @@ 
 	public function loadPostData($key, $values)
 	{
 		$value = $values[$key];
-		if($this->getAutoTrim())
+		if ($this->getAutoTrim())
 			$value = trim($value);
-		if(!$this->getReadOnly() && $this->getText() !== $value)
+		if (!$this->getReadOnly() && $this->getText() !== $value)
 		{
 			$this->setText($value);
 			return $this->_dataChanged = true;
@@ -332,7 +332,7 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
+		if ($this->getAutoPostBack() && $this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onTextChanged(null);
 	}
@@ -343,7 +343,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getTextMode() === 'MultiLine')
+		if ($this->getTextMode() === 'MultiLine')
 			$writer->write(THttpUtility::htmlEncode($this->getText()));
 	}
 
@@ -355,7 +355,7 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if($this->getTextMode() === 'MultiLine')
+		if ($this->getTextMode() === 'MultiLine')
 			$writer->write("\n");
 	}
 
@@ -562,7 +562,7 @@ 
 	 */
 	public function getSafeText()
 	{
-		if($this->_safeText === null)
+		if ($this->_safeText === null)
 			$this->_safeText = $this->getSafeTextParser()->purify($this->getText());
 		return $this->_safeText;
 	}
@@ -572,7 +572,7 @@ 
 	 */
 	protected function getSafeTextParser()
 	{
-		if(!self::$_safeTextParser)
+		if (!self::$_safeTextParser)
 			self::$_safeTextParser = new \HTMLPurifier($this->getConfig());
 		return self::$_safeTextParser;
 	}

Braces +62 added lines, -46 removed lines

@@ -109,20 +109,23 @@ 
 	{
 		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
-		if(($uid = $this->getUniqueID()) !== '')
-			$writer->addAttribute('name', $uid);
+		if(($uid = $this->getUniqueID()) !== '') {
+					$writer->addAttribute('name', $uid);
+		}
 		if(($textMode = $this->getTextMode()) === TTextBoxMode::MultiLine)
 		{
-			if(($rows = $this->getRows()) <= 0)
-				$rows = self::DEFAULT_ROWS;
-			if(($cols = $this->getColumns()) <= 0)
-				$cols = self::DEFAULT_COLUMNS;
+			if(($rows = $this->getRows()) <= 0) {
+							$rows = self::DEFAULT_ROWS;
+			}
+			if(($cols = $this->getColumns()) <= 0) {
+							$cols = self::DEFAULT_COLUMNS;
+			}
 			$writer->addAttribute('rows', "$rows");
 			$writer->addAttribute('cols', "$cols");
-			if(!$this->getWrap())
-				$writer->addAttribute('wrap', 'off');
-		}
-		else
+			if(!$this->getWrap()) {
+							$writer->addAttribute('wrap', 'off');
+			}
+		} else
 		{
 			switch($textMode)
 			{
@@ -174,39 +177,46 @@ 
 					break;
 			}
 
-			if(($text = $this->getText()) !== '' && ($textMode !== TTextBoxMode::Password || $this->getPersistPassword()))
-				$writer->addAttribute('value', $text);
+			if(($text = $this->getText()) !== '' && ($textMode !== TTextBoxMode::Password || $this->getPersistPassword())) {
+							$writer->addAttribute('value', $text);
+			}
 
 			if(($act = $this->getAutoCompleteType()) !== 'None')
 			{
-				if($act === 'Disabled')
-					$writer->addAttribute('autocomplete', 'off');
-				elseif($act === 'Search')
-					$writer->addAttribute('vcard_name', 'search');
-				elseif($act === 'HomeCountryRegion')
-					$writer->addAttribute('vcard_name', 'HomeCountry');
-				elseif($act === 'BusinessCountryRegion')
-					$writer->addAttribute('vcard_name', 'BusinessCountry');
-				else
+				if($act === 'Disabled') {
+									$writer->addAttribute('autocomplete', 'off');
+				} elseif($act === 'Search') {
+									$writer->addAttribute('vcard_name', 'search');
+				} elseif($act === 'HomeCountryRegion') {
+									$writer->addAttribute('vcard_name', 'HomeCountry');
+				} elseif($act === 'BusinessCountryRegion') {
+									$writer->addAttribute('vcard_name', 'BusinessCountry');
+				} else
 				{
-					if(strpos($act, 'Business') === 0)
-						$act = 'Business' . '.' . substr($act, 8);
-					elseif(strpos($act, 'Home') === 0)
-						$act = 'Home' . '.' . substr($act, 4);
+					if(strpos($act, 'Business') === 0) {
+											$act = 'Business' . '.' . substr($act, 8);
+					} elseif(strpos($act, 'Home') === 0) {
+											$act = 'Home' . '.' . substr($act, 4);
+					}
 					$writer->addAttribute('vcard_name', 'vCard.' . $act);
 				}
 			}
 
-			if(($cols = $this->getColumns()) > 0)
-				$writer->addAttribute('size', "$cols");
-			if(($maxLength = $this->getMaxLength()) > 0)
-				$writer->addAttribute('maxlength', "$maxLength");
+			if(($cols = $this->getColumns()) > 0) {
+							$writer->addAttribute('size', "$cols");
+			}
+			if(($maxLength = $this->getMaxLength()) > 0) {
+							$writer->addAttribute('maxlength', "$maxLength");
+			}
+		}
+		if($this->getReadOnly()) {
+					$writer->addAttribute('readonly', 'readonly');
 		}
-		if($this->getReadOnly())
-			$writer->addAttribute('readonly', 'readonly');
 		$isEnabled = $this->getEnabled(true);
-		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
+		if(!$isEnabled && $this->getEnabled()) {
+			// in this case parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
+		}
 		if($isEnabled
 			&& $this->getEnableClientScript()
 			&& ($this->getAutoPostBack() || $textMode === TTextBoxMode::SingleLine)
@@ -262,15 +272,16 @@ 
 	public function loadPostData($key, $values)
 	{
 		$value = $values[$key];
-		if($this->getAutoTrim())
-			$value = trim($value);
+		if($this->getAutoTrim()) {
+					$value = trim($value);
+		}
 		if(!$this->getReadOnly() && $this->getText() !== $value)
 		{
 			$this->setText($value);
 			return $this->_dataChanged = true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -332,8 +343,9 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getAutoPostBack() && $this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onTextChanged(null);
 	}
 
@@ -343,8 +355,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getTextMode() === 'MultiLine')
-			$writer->write(THttpUtility::htmlEncode($this->getText()));
+		if($this->getTextMode() === 'MultiLine') {
+					$writer->write(THttpUtility::htmlEncode($this->getText()));
+		}
 	}
 
 	/**
@@ -355,8 +368,9 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if($this->getTextMode() === 'MultiLine')
-			$writer->write("\n");
+		if($this->getTextMode() === 'MultiLine') {
+					$writer->write("\n");
+		}
 	}
 
 	/**
@@ -562,8 +576,9 @@ 
 	 */
 	public function getSafeText()
 	{
-		if($this->_safeText === null)
-			$this->_safeText = $this->getSafeTextParser()->purify($this->getText());
+		if($this->_safeText === null) {
+					$this->_safeText = $this->getSafeTextParser()->purify($this->getText());
+		}
 		return $this->_safeText;
 	}
 
@@ -572,8 +587,9 @@ 
 	 */
 	protected function getSafeTextParser()
 	{
-		if(!self::$_safeTextParser)
-			self::$_safeTextParser = new \HTMLPurifier($this->getConfig());
+		if(!self::$_safeTextParser) {
+					self::$_safeTextParser = new \HTMLPurifier($this->getConfig());
+		}
 		return self::$_safeTextParser;
 	}
 

framework/Web/UI/WebControls/TClientScript.php

Spacing +4 added lines, -4 removed lines

@@ -111,9 +111,9 @@ 
 		parent::onPreRender($param);
 		$scripts = preg_split('/,|\s+/', $this->getPradoScripts());
 		$cs = $this->getPage()->getClientScript();
-		foreach($scripts as $script)
+		foreach ($scripts as $script)
 		{
-			if(($script = trim($script)) !== '')
+			if (($script = trim($script)) !== '')
 				$cs->registerPradoScript($script);
 		}
 	}
@@ -138,7 +138,7 @@ 
 	 */
 	protected function renderCustomScriptFile($writer)
 	{
-		if(($scriptUrl = $this->getScriptUrl()) !== '')
+		if (($scriptUrl = $this->getScriptUrl()) !== '')
 			$writer->write("<script type=\"text/javascript\" src=\"$scriptUrl\"></script>\n");
 	}
 
@@ -148,7 +148,7 @@ 
 	 */
 	protected function renderCustomScript($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
 			$writer->write("<script type=\"text/javascript\">\n/*<![CDATA[*/\n");
 			$this->renderChildren($writer);

Braces +9 added lines, -6 removed lines

@@ -113,8 +113,9 @@ 
 		$cs = $this->getPage()->getClientScript();
 		foreach($scripts as $script)
 		{
-			if(($script = trim($script)) !== '')
-				$cs->registerPradoScript($script);
+			if(($script = trim($script)) !== '') {
+							$cs->registerPradoScript($script);
+			}
 		}
 	}
 
@@ -126,8 +127,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if ($this->getFlushScriptFiles())
-			$this->getPage()->getClientScript()->flushScriptFiles($writer, $this);
+		if ($this->getFlushScriptFiles()) {
+					$this->getPage()->getClientScript()->flushScriptFiles($writer, $this);
+		}
 		$this->renderCustomScriptFile($writer);
 		$this->renderCustomScript($writer);
 	}
@@ -138,8 +140,9 @@ 
 	 */
 	protected function renderCustomScriptFile($writer)
 	{
-		if(($scriptUrl = $this->getScriptUrl()) !== '')
-			$writer->write("<script type=\"text/javascript\" src=\"$scriptUrl\"></script>\n");
+		if(($scriptUrl = $this->getScriptUrl()) !== '') {
+					$writer->write("<script type=\"text/javascript\" src=\"$scriptUrl\"></script>\n");
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TTextProcessor.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if(is_string($object))
+		if (is_string($object))
 			$object = html_entity_decode($object, ENT_QUOTES, 'UTF-8');
 		parent::addParsedObject($object);
 	}
@@ -76,13 +76,13 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) === '' && $this->getHasControls())
+		if (($text = $this->getText()) === '' && $this->getHasControls())
 		{
 			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 			parent::renderContents($htmlWriter);
 			$text = $htmlWriter->flush();
 		}
-		if($text !== '')
+		if ($text !== '')
 			$writer->write($this->processText($text));
 	}
 

Braces +6 added lines, -4 removed lines

@@ -47,8 +47,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if(is_string($object))
-			$object = html_entity_decode($object, ENT_QUOTES, 'UTF-8');
+		if(is_string($object)) {
+					$object = html_entity_decode($object, ENT_QUOTES, 'UTF-8');
+		}
 		parent::addParsedObject($object);
 	}
 
@@ -82,8 +83,9 @@ 
 			parent::renderContents($htmlWriter);
 			$text = $htmlWriter->flush();
 		}
-		if($text !== '')
-			$writer->write($this->processText($text));
+		if($text !== '') {
+					$writer->write($this->processText($text));
+		}
 	}
 
 }

framework/Web/UI/WebControls/TBulletedList.php

Spacing +18 added lines, -18 removed lines

@@ -60,9 +60,9 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TBulletedListEventParameter((int)$param));
+		$this->onClick(new TBulletedListEventParameter((int) $param));
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	protected function getTagName()
 	{
-		switch($this->getBulletStyle())
+		switch ($this->getBulletStyle())
 		{
 			case TBulletStyle::Numbered:
 			case TBulletStyle::LowerAlpha:
@@ -100,7 +100,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		$needStart = false;
-		switch($this->getBulletStyle())
+		switch ($this->getBulletStyle())
 		{
 			case TBulletStyle::None:
 				$writer->addStyleAttribute('list-style-type', 'none');
@@ -140,7 +140,7 @@ 
 				$writer->addStyleAttribute('list-style-image', "url($url)");
 				break;
 		}
-		if($needStart && ($start = $this->getFirstBulletNumber()) != 1)
+		if ($needStart && ($start = $this->getFirstBulletNumber()) != 1)
 			$writer->addAttribute('start', "$start");
 		parent::addAttributesToRender($writer);
 	}
@@ -249,7 +249,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasItems())
+		if ($this->getHasItems())
 			parent::render($writer);
 	}
 
@@ -262,9 +262,9 @@ 
 		$this->_isEnabled = $this->getEnabled(true);
 		$this->_postBackOptions = $this->getPostBackOptions();
 		$writer->writeLine();
-		foreach($this->getItems() as $index => $item)
+		foreach ($this->getItems() as $index => $item)
 		{
-			if($item->getHasAttributes())
+			if ($item->getHasAttributes())
 				$writer->addAttributes($item->getAttributes());
 			$writer->renderBeginTag('li');
 			$this->renderBulletText($writer, $item, $index);
@@ -281,7 +281,7 @@ 
 	 */
 	protected function renderBulletText($writer, $item, $index)
 	{
-		switch($this->getDisplayMode())
+		switch ($this->getDisplayMode())
 		{
 			case TBulletedListDisplayMode::Text:
 				$this->renderTextItem($writer, $item, $index);
@@ -297,7 +297,7 @@ 
 
 	protected function renderTextItem($writer, $item, $index)
 	{
-		if($item->getEnabled())
+		if ($item->getEnabled())
 			$writer->write(THttpUtility::htmlEncode($item->getText()));
 		else
 		{
@@ -310,15 +310,15 @@ 
 
 	protected function renderHyperLinkItem($writer, $item, $index)
 	{
-		if(!$this->_isEnabled || !$item->getEnabled())
+		if (!$this->_isEnabled || !$item->getEnabled())
 			$writer->addAttribute('disabled', 'disabled');
 		else
 		{
 			$writer->addAttribute('href', $item->getValue());
-			if(($target = $this->getTarget()) !== '')
+			if (($target = $this->getTarget()) !== '')
 				$writer->addAttribute('target', $target);
 		}
-		if(($accesskey = $this->getAccessKey()) !== '')
+		if (($accesskey = $this->getAccessKey()) !== '')
 			$writer->addAttribute('accesskey', $accesskey);
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
@@ -327,17 +327,17 @@ 
 
 	protected function renderLinkButtonItem($writer, $item, $index)
 	{
-		if(!$this->_isEnabled || !$item->getEnabled())
+		if (!$this->_isEnabled || !$item->getEnabled())
 			$writer->addAttribute('disabled', 'disabled');
 		else
 		{
 			$this->_currentRenderItemIndex = $index;
-			$writer->addAttribute('id', $this->getClientID() . $index);
-			$writer->addAttribute('href', "javascript:;//" . $this->getClientID() . $index);
+			$writer->addAttribute('id', $this->getClientID().$index);
+			$writer->addAttribute('href', "javascript:;//".$this->getClientID().$index);
 			$cs = $this->getPage()->getClientScript();
 			$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 		}
-		if(($accesskey = $this->getAccessKey()) !== '')
+		if (($accesskey = $this->getAccessKey()) !== '')
 			$writer->addAttribute('accesskey', $accesskey);
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
@@ -353,7 +353,7 @@ 
 		$options['CausesValidation'] = $this->getCausesValidation();
 		$options['EventTarget'] = $this->getUniqueID();
 		$options['EventParameter'] = $this->_currentRenderItemIndex;
-		$options['ID'] = $this->getClientID() . $this->_currentRenderItemIndex;
+		$options['ID'] = $this->getClientID().$this->_currentRenderItemIndex;
 		$options['StopEvent'] = true;
 		return $options;
 	}

Braces +30 added lines, -23 removed lines

@@ -60,8 +60,9 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onClick(new TBulletedListEventParameter((int)$param));
 	}
 
@@ -140,8 +141,9 @@ 
 				$writer->addStyleAttribute('list-style-image', "url($url)");
 				break;
 		}
-		if($needStart && ($start = $this->getFirstBulletNumber()) != 1)
-			$writer->addAttribute('start', "$start");
+		if($needStart && ($start = $this->getFirstBulletNumber()) != 1) {
+					$writer->addAttribute('start', "$start");
+		}
 		parent::addAttributesToRender($writer);
 	}
 
@@ -249,8 +251,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasItems())
-			parent::render($writer);
+		if($this->getHasItems()) {
+					parent::render($writer);
+		}
 	}
 
 	/**
@@ -264,8 +267,9 @@ 
 		$writer->writeLine();
 		foreach($this->getItems() as $index => $item)
 		{
-			if($item->getHasAttributes())
-				$writer->addAttributes($item->getAttributes());
+			if($item->getHasAttributes()) {
+							$writer->addAttributes($item->getAttributes());
+			}
 			$writer->renderBeginTag('li');
 			$this->renderBulletText($writer, $item, $index);
 			$writer->renderEndTag();
@@ -297,9 +301,9 @@ 
 
 	protected function renderTextItem($writer, $item, $index)
 	{
-		if($item->getEnabled())
-			$writer->write(THttpUtility::htmlEncode($item->getText()));
-		else
+		if($item->getEnabled()) {
+					$writer->write(THttpUtility::htmlEncode($item->getText()));
+		} else
 		{
 			$writer->addAttribute('disabled', 'disabled');
 			$writer->renderBeginTag('span');
@@ -310,16 +314,18 @@ 
 
 	protected function renderHyperLinkItem($writer, $item, $index)
 	{
-		if(!$this->_isEnabled || !$item->getEnabled())
-			$writer->addAttribute('disabled', 'disabled');
-		else
+		if(!$this->_isEnabled || !$item->getEnabled()) {
+					$writer->addAttribute('disabled', 'disabled');
+		} else
 		{
 			$writer->addAttribute('href', $item->getValue());
-			if(($target = $this->getTarget()) !== '')
-				$writer->addAttribute('target', $target);
+			if(($target = $this->getTarget()) !== '') {
+							$writer->addAttribute('target', $target);
+			}
+		}
+		if(($accesskey = $this->getAccessKey()) !== '') {
+					$writer->addAttribute('accesskey', $accesskey);
 		}
-		if(($accesskey = $this->getAccessKey()) !== '')
-			$writer->addAttribute('accesskey', $accesskey);
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
 		$writer->renderEndTag();
@@ -327,9 +333,9 @@ 
 
 	protected function renderLinkButtonItem($writer, $item, $index)
 	{
-		if(!$this->_isEnabled || !$item->getEnabled())
-			$writer->addAttribute('disabled', 'disabled');
-		else
+		if(!$this->_isEnabled || !$item->getEnabled()) {
+					$writer->addAttribute('disabled', 'disabled');
+		} else
 		{
 			$this->_currentRenderItemIndex = $index;
 			$writer->addAttribute('id', $this->getClientID() . $index);
@@ -337,8 +343,9 @@ 
 			$cs = $this->getPage()->getClientScript();
 			$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 		}
-		if(($accesskey = $this->getAccessKey()) !== '')
-			$writer->addAttribute('accesskey', $accesskey);
+		if(($accesskey = $this->getAccessKey()) !== '') {
+					$writer->addAttribute('accesskey', $accesskey);
+		}
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
 		$writer->renderEndTag();

framework/Web/UI/WebControls/TColorPicker.php

Spacing +10 added lines, -10 removed lines

@@ -132,7 +132,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
+		if ($this->_clientSide === null)
 			$this->_clientSide = $this->createClientSide();
 		return $this->_clientSide;
 	}
@@ -154,11 +154,11 @@ 
 		$options = parent::getPostBackOptions();
 		$options['ClassName'] = $this->getCssClass();
 		$options['ShowColorPicker'] = $this->getShowColorPicker();
-		if($options['ShowColorPicker'])
+		if ($options['ShowColorPicker'])
 		{
 			$mode = $this->getMode();
-			if($mode == TColorPickerMode::Full) $options['Mode'] = $mode;
-			elseif($mode == TColorPickerMode::Simple) $options['Palette'] = 'Tiny';
+			if ($mode == TColorPickerMode::Full) $options['Mode'] = $mode;
+			elseif ($mode == TColorPickerMode::Simple) $options['Palette'] = 'Tiny';
 			$options['OKButtonText'] = $this->getOKButtonText();
 			$options['CancelButtonText'] = $this->getCancelButtonText();
 		}
@@ -173,7 +173,7 @@ 
 	protected function getAssetUrl($file = '')
 	{
 		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
-		return $base . '/' . self::SCRIPT_PATH . '/' . $file;
+		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
 	/**
@@ -191,15 +191,15 @@ 
 	protected function publishColorPickerAssets()
 	{
 		$cs = $this->getPage()->getClientScript();
-		$key = "prado:" . get_class($this);
+		$key = "prado:".get_class($this);
 		$imgs['button.gif'] = $this->getAssetUrl('button.gif');
 		$imgs['background.png'] = $this->getAssetUrl('background.png');
 		$options = TJavaScript::encode($imgs);
 		$code = "Prado.WebUI.TColorPicker.UIImages = {$options};";
 		$cs->registerEndScript($key, $code);
 		$cs->registerPradoScript("colorpicker");
-		$url = $this->getAssetUrl($this->getColorPickerStyle() . '.css');
-		if(!$cs->isStyleSheetFileRegistered($url))
+		$url = $this->getAssetUrl($this->getColorPickerStyle().'.css');
+		if (!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 	}
 
@@ -217,9 +217,9 @@ 
 		$writer->addAttribute('class', 'TColorPicker_button');
 		$writer->renderBeginTag('span');
 
-		$writer->addAttribute('id', $this->getClientID() . '_button');
+		$writer->addAttribute('id', $this->getClientID().'_button');
 		$writer->addAttribute('src', $this->getAssetUrl('button.gif'));
-		if($color !== '')
+		if ($color !== '')
 			$writer->addAttribute('style', "background-color:{$color};");
 		$writer->addAttribute('width', '20');
 		$writer->addAttribute('height', '20');

Braces +14 added lines, -8 removed lines

@@ -132,8 +132,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
-			$this->_clientSide = $this->createClientSide();
+		if($this->_clientSide === null) {
+					$this->_clientSide = $this->createClientSide();
+		}
 		return $this->_clientSide;
 	}
 
@@ -157,8 +158,11 @@ 
 		if($options['ShowColorPicker'])
 		{
 			$mode = $this->getMode();
-			if($mode == TColorPickerMode::Full) $options['Mode'] = $mode;
-			elseif($mode == TColorPickerMode::Simple) $options['Palette'] = 'Tiny';
+			if($mode == TColorPickerMode::Full) {
+				$options['Mode'] = $mode;
+			} elseif($mode == TColorPickerMode::Simple) {
+				$options['Palette'] = 'Tiny';
+			}
 			$options['OKButtonText'] = $this->getOKButtonText();
 			$options['CancelButtonText'] = $this->getCancelButtonText();
 		}
@@ -199,8 +203,9 @@ 
 		$cs->registerEndScript($key, $code);
 		$cs->registerPradoScript("colorpicker");
 		$url = $this->getAssetUrl($this->getColorPickerStyle() . '.css');
-		if(!$cs->isStyleSheetFileRegistered($url))
-			$cs->registerStyleSheetFile($url, $url);
+		if(!$cs->isStyleSheetFileRegistered($url)) {
+					$cs->registerStyleSheetFile($url, $url);
+		}
 	}
 
 	/**
@@ -219,8 +224,9 @@ 
 
 		$writer->addAttribute('id', $this->getClientID() . '_button');
 		$writer->addAttribute('src', $this->getAssetUrl('button.gif'));
-		if($color !== '')
-			$writer->addAttribute('style', "background-color:{$color};");
+		if($color !== '') {
+					$writer->addAttribute('style', "background-color:{$color};");
+		}
 		$writer->addAttribute('width', '20');
 		$writer->addAttribute('height', '20');
 		$writer->addAttribute('alt', '');

framework/Web/UI/WebControls/TFileUploadItem.php

Spacing +3 added lines, -3 removed lines

@@ -134,11 +134,11 @@
    */
   public function saveAs($fileName, $deleteTempFile = true)
   {
-	if($this->_errorCode === UPLOAD_ERR_OK)
+	if ($this->_errorCode === UPLOAD_ERR_OK)
 	{
-	  if($deleteTempFile)
+	  if ($deleteTempFile)
 		return move_uploaded_file($this->_localName, $fileName);
-	  elseif(is_uploaded_file($this->_localName))
+	  elseif (is_uploaded_file($this->_localName))
 		return file_put_contents($fileName, file_get_contents($this->_localName)) !== false;
 	  else
 		return false;

Braces +9 added lines, -8 removed lines

@@ -136,15 +136,16 @@
   {
 	if($this->_errorCode === UPLOAD_ERR_OK)
 	{
-	  if($deleteTempFile)
-		return move_uploaded_file($this->_localName, $fileName);
-	  elseif(is_uploaded_file($this->_localName))
-		return file_put_contents($fileName, file_get_contents($this->_localName)) !== false;
-	  else
-		return false;
+	  if($deleteTempFile) {
+	  		return move_uploaded_file($this->_localName, $fileName);
+	  } elseif(is_uploaded_file($this->_localName)) {
+	  		return file_put_contents($fileName, file_get_contents($this->_localName)) !== false;
+	  } else {
+	  		return false;
+	  }
+	} else {
+		  return false;
 	}
-	else
-	  return false;
   }
 
   /**

framework/Web/UI/WebControls/TDropDownList.php

Spacing +5 added lines, -5 removed lines

@@ -75,14 +75,14 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if(!$this->getEnabled(true))
+		if (!$this->getEnabled(true))
 			return false;
 		$this->ensureDataBound();
-		$selection = isset($values[$key])?$values[$key]:null;
-		if($selection !== null)
+		$selection = isset($values[$key]) ? $values[$key] : null;
+		if ($selection !== null)
 		{
 			$index = $this->getItems()->findIndexByValue($selection, false);
-			if($this->getSelectedIndex() !== $index)
+			if ($this->getSelectedIndex() !== $index)
 			{
 				$this->setSelectedIndex($index);
 				return $this->_dataChanged = true;
@@ -100,7 +100,7 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
+		if ($this->getAutoPostBack() && $this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onSelectedIndexChanged(null);
 	}

Braces +6 added lines, -4 removed lines

@@ -75,8 +75,9 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if(!$this->getEnabled(true))
-			return false;
+		if(!$this->getEnabled(true)) {
+					return false;
+		}
 		$this->ensureDataBound();
 		$selection = isset($values[$key])?$values[$key]:null;
 		if($selection !== null)
@@ -100,8 +101,9 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getAutoPostBack() && $this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onSelectedIndexChanged(null);
 	}
 

framework/Web/UI/WebControls/THtmlArea.php

Spacing +14 added lines, -14 removed lines

@@ -311,7 +311,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getEnableVisualEdit() && $this->getEnabled(true))
+		if ($this->getEnableVisualEdit() && $this->getEnabled(true))
 		{
 			$writer->addAttribute('id', $this->getClientID());
 			$this->registerEditorClientScript($writer);
@@ -358,7 +358,7 @@ 
 
 		$options = TJavaScript::encode($options, true, true);
 		$script = "new {$this->getClientClassName()}($options)";
-		$scripts->registerEndScript('prado:THtmlArea' . $this->ClientID, $script);
+		$scripts->registerEndScript('prado:THtmlArea'.$this->ClientID, $script);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 */
 	protected function getScriptUrl()
 	{
-		return $this->getScriptDeploymentPath() . '/tiny_mce/tiny_mce.js';
+		return $this->getScriptDeploymentPath().'/tiny_mce/tiny_mce.js';
 	}
 
 	/**
@@ -377,7 +377,7 @@ 
 	{
 		$tarfile = Prado::getPathOfNamespace('Vendor.pradosoft.prado-tinymce3.tiny_mce', '.tar');
 		$md5sum = Prado::getPathOfNamespace('Vendor.pradosoft.prado-tinymce3.tiny_mce', '.md5');
-		if($tarfile === null || $md5sum === null)
+		if ($tarfile === null || $md5sum === null)
 			throw new TConfigurationException('htmlarea_tarfile_invalid');
 		$url = $this->getApplication()->getAssetManager()->publishTarFile($tarfile, $md5sum);
 		$this->copyCustomPlugins($url);
@@ -386,12 +386,12 @@ 
 
 	protected function copyCustomPlugins($url)
 	{
-		if($plugins = $this->getCustomPluginPath())
+		if ($plugins = $this->getCustomPluginPath())
 		{
 			$assets = $this->getApplication()->getAssetManager();
 			$path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
-			$dest = $assets->getBasePath() . '/' . basename($url) . '/tiny_mce/plugins/' . basename($path);
-			if(!is_dir($dest) || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dest = $assets->getBasePath().'/'.basename($url).'/tiny_mce/plugins/'.basename($path);
+			if (!is_dir($dest) || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 				$assets->copyDirectory($path, $dest);
 		}
 	}
@@ -418,7 +418,7 @@ 
 		$options['theme_advanced_toolbar_align'] = 'left';
 		$options['theme_advanced_path_location'] = 'bottom';
 		$options['extended_valid_elements'] = 'a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
-		if($this->getReadOnly())
+		if ($this->getReadOnly())
 			$options['readonly'] = true;
 
 		$options = array_merge($options, $this->parseEditorOptions($this->getOptions()));
@@ -433,11 +433,11 @@ 
 	{
 		$options = [];
 		$substrings = preg_split('/,\s*\n|\n/', trim($string));
-		foreach($substrings as $bits)
+		foreach ($substrings as $bits)
 		{
 			$option = explode(":", $bits, 2);
 
-			if(count($option) == 2)
+			if (count($option) == 2)
 			{
 				$value = trim(trim($option[1]), "'\"");
 				if (($s = strtolower($value)) === 'false')
@@ -456,15 +456,15 @@ 
 	protected function getLanguageSuffix($culture)
 	{
 		$app = $this->getApplication()->getGlobalization();
-		if(empty($culture) && ($app !== null))
+		if (empty($culture) && ($app !== null))
 			$culture = $app->getCulture();
 		$variants = [];
-		if($app !== null)
+		if ($app !== null)
 			$variants = $app->getCultureVariants($culture);
 
-		foreach($variants as $variant)
+		foreach ($variants as $variant)
 		{
-			if(isset(self::$_langs[$variant]))
+			if (isset(self::$_langs[$variant]))
 				return self::$_langs[$variant];
 		}
 

Braces +23 added lines, -16 removed lines

@@ -377,8 +377,9 @@ 
 	{
 		$tarfile = Prado::getPathOfNamespace('Vendor.pradosoft.prado-tinymce3.tiny_mce', '.tar');
 		$md5sum = Prado::getPathOfNamespace('Vendor.pradosoft.prado-tinymce3.tiny_mce', '.md5');
-		if($tarfile === null || $md5sum === null)
-			throw new TConfigurationException('htmlarea_tarfile_invalid');
+		if($tarfile === null || $md5sum === null) {
+					throw new TConfigurationException('htmlarea_tarfile_invalid');
+		}
 		$url = $this->getApplication()->getAssetManager()->publishTarFile($tarfile, $md5sum);
 		$this->copyCustomPlugins($url);
 		return $url;
@@ -391,8 +392,9 @@ 
 			$assets = $this->getApplication()->getAssetManager();
 			$path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
 			$dest = $assets->getBasePath() . '/' . basename($url) . '/tiny_mce/plugins/' . basename($path);
-			if(!is_dir($dest) || $this->getApplication()->getMode() !== TApplicationMode::Performance)
-				$assets->copyDirectory($path, $dest);
+			if(!is_dir($dest) || $this->getApplication()->getMode() !== TApplicationMode::Performance) {
+							$assets->copyDirectory($path, $dest);
+			}
 		}
 	}
 
@@ -418,8 +420,9 @@ 
 		$options['theme_advanced_toolbar_align'] = 'left';
 		$options['theme_advanced_path_location'] = 'bottom';
 		$options['extended_valid_elements'] = 'a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
-		if($this->getReadOnly())
-			$options['readonly'] = true;
+		if($this->getReadOnly()) {
+					$options['readonly'] = true;
+		}
 
 		$options = array_merge($options, $this->parseEditorOptions($this->getOptions()));
 		return $options;
@@ -440,10 +443,11 @@ 
 			if(count($option) == 2)
 			{
 				$value = trim(trim($option[1]), "'\"");
-				if (($s = strtolower($value)) === 'false')
-					$value = false;
-				elseif ($s === 'true')
-					$value = true;
+				if (($s = strtolower($value)) === 'false') {
+									$value = false;
+				} elseif ($s === 'true') {
+									$value = true;
+				}
 				$options[trim($option[0])] = $value;
 			}
 		}
@@ -456,16 +460,19 @@ 
 	protected function getLanguageSuffix($culture)
 	{
 		$app = $this->getApplication()->getGlobalization();
-		if(empty($culture) && ($app !== null))
-			$culture = $app->getCulture();
+		if(empty($culture) && ($app !== null)) {
+					$culture = $app->getCulture();
+		}
 		$variants = [];
-		if($app !== null)
-			$variants = $app->getCultureVariants($culture);
+		if($app !== null) {
+					$variants = $app->getCultureVariants($culture);
+		}
 
 		foreach($variants as $variant)
 		{
-			if(isset(self::$_langs[$variant]))
-				return self::$_langs[$variant];
+			if(isset(self::$_langs[$variant])) {
+							return self::$_langs[$variant];
+			}
 		}
 
 		return 'en';