pradosoft / prado

framework/Web/UI/WebControls/TRadioButtonList.php

Spacing +4 added lines, -4 removed lines

@@ -54,14 +54,14 @@
 	 */
 	public function loadPostData($key, $values)
 	{
-		$value = isset($values[$key])?$values[$key]:'';
+		$value = isset($values[$key]) ? $values[$key] : '';
 		$oldSelection = $this->getSelectedIndex();
 		$this->ensureDataBound();
-		foreach($this->getItems() as $index => $item)
+		foreach ($this->getItems() as $index => $item)
 		{
-			if($item->getEnabled() && $item->getValue() === $value)
+			if ($item->getEnabled() && $item->getValue() === $value)
 			{
-				if($index === $oldSelection)
+				if ($index === $oldSelection)
 					return false;
 				else
 				{

Braces +3 added lines, -3 removed lines

@@ -61,9 +61,9 @@
 		{
 			if($item->getEnabled() && $item->getValue() === $value)
 			{
-				if($index === $oldSelection)
-					return false;
-				else
+				if($index === $oldSelection) {
+									return false;
+				} else
 				{
 					$this->setSelectedIndex($index);
 					return true;

framework/Web/UI/WebControls/TReCaptcha.php

Spacing +21 added lines, -22 removed lines

@@ -178,8 +178,7 @@ 
 
 	public function validate()
 	{
-		if (!
-			  (
+		if (!(
 			($challenge = @$_POST[$this->getChallengeFieldName()])
 			and
 			($response = @$_POST[$this->getResponseFieldName()])
@@ -203,9 +202,9 @@ 
 	{
 		parent::onPreRender($param);
 
-		if("" == $this->getPublicKey())
+		if ("" == $this->getPublicKey())
 			throw new TConfigurationException('recaptcha_publickey_unknown');
-		if("" == $this->getPrivateKey())
+		if ("" == $this->getPrivateKey())
 			throw new TConfigurationException('recaptcha_privatekey_unknown');
 
 		// need to register captcha fields so they will be sent back also in callbacks
@@ -225,21 +224,21 @@ 
 		// if we're in a callback, then schedule re-rendering of the control
 		// if not, don't do anything, because a new challenge will be rendered anyway
 		if ($this->Page->IsCallback)
-			$this->Page->CallbackClient->jQuery($this->getClientID() . ' #recaptcha_reload', 'click');
+			$this->Page->CallbackClient->jQuery($this->getClientID().' #recaptcha_reload', 'click');
 	}
 
 	public function renderContents($writer)
 	{
-		$readyscript = 'jQuery(document).trigger(' . TJavaScript::quoteString('captchaready:' . $this->getClientID()) . ')';
+		$readyscript = 'jQuery(document).trigger('.TJavaScript::quoteString('captchaready:'.$this->getClientID()).')';
 		$cs = $this->Page->ClientScript;
 		$id = $this->getClientID();
-		$divid = $id . '_1_recaptchadiv';
-		$writer->write('<div id="' . htmlspecialchars($divid) . '">');
+		$divid = $id.'_1_recaptchadiv';
+		$writer->write('<div id="'.htmlspecialchars($divid).'">');
 	
 		if (!$this->Page->IsCallback)
 			{
 				$writer->write(TJavaScript::renderScriptBlock(
-					'var RecaptchaOptions = ' . TJavaScript::jsonEncode($this->getClientSideOptions()) . ';'
+					'var RecaptchaOptions = '.TJavaScript::jsonEncode($this->getClientSideOptions()).';'
 				));
 	
 				$html = $this->recaptcha_get_html($this->getPublicKey());
@@ -253,20 +252,20 @@ 
 				*/
 				$writer->write($html);
 
-				$cs->registerEndScript('ReCaptcha::EventScript', 'jQuery(document).ready(function() { ' . $readyscript . '; } );');
+				$cs->registerEndScript('ReCaptcha::EventScript', 'jQuery(document).ready(function() { '.$readyscript.'; } );');
 			}
 		else
 			{
 				$options = $this->getClientSideOptions();
-				$options['callback'] = new TJavaScriptLiteral('function() { ' . $readyscript . '; ' . $this->getCallbackScript() . '; }');
+				$options['callback'] = new TJavaScriptLiteral('function() { '.$readyscript.'; '.$this->getCallbackScript().'; }');
 				$cs->registerScriptFile('ReCaptcha::AjaxScript', self::RECAPTCHA_JS);
-				$cs->registerEndScript('ReCaptcha::CreateScript::' . $id, implode(' ', [
-					'if (!jQuery(' . TJavaScript::quoteString('#' . $this->getResponseFieldName()) . '))',
+				$cs->registerEndScript('ReCaptcha::CreateScript::'.$id, implode(' ', [
+					'if (!jQuery('.TJavaScript::quoteString('#'.$this->getResponseFieldName()).'))',
 					'{',
 					'Recaptcha.destroy();',
 					'Recaptcha.create(',
-						TJavaScript::quoteString($this->getPublicKey()) . ', ',
-						TJavaScript::quoteString($divid) . ', ',
+						TJavaScript::quoteString($this->getPublicKey()).', ',
+						TJavaScript::quoteString($divid).', ',
 						TJavaScript::encode($options),
 					');',
 					'}',
@@ -291,11 +290,11 @@ 
 		$server = $use_ssl ? self::RECAPTCHA_API_SECURE_SERVER : $server = self::RECAPTCHA_API_SERVER;
 		$errorpart = '';
 		if ($error)
-			$errorpart = "&amp;error=" . $error;
+			$errorpart = "&amp;error=".$error;
 
-		return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+		return '<script type="text/javascript" src="'.$server.'/challenge?k='.$pubkey.$errorpart.'"></script>
 		<noscript>
-		<iframe src="' . $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+		<iframe src="' . $server.'/noscript?k='.$pubkey.$errorpart.'" height="300" width="500" frameborder="0"></iframe><br/>
 		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
 		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
 		</noscript>';
@@ -306,10 +305,10 @@ 
 	 * @param $data - array of string elements to be encoded
 	 * @return string - encoded request
 	 */
-	private function recaptcha_qsencode ($data) {
+	private function recaptcha_qsencode($data) {
 		$req = "";
 		foreach ($data as $key => $value)
-			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+			$req .= $key.'='.urlencode(stripslashes($value)).'&';
 
 		// Cut the last '&'
 		$req = substr($req, 0, strlen($req) - 1);
@@ -331,13 +330,13 @@ 
 		$http_request = "POST $path HTTP/1.0\r\n";
 		$http_request .= "Host: $host\r\n";
 		$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-		$http_request .= "Content-Length: " . strlen($req) . "\r\n";
+		$http_request .= "Content-Length: ".strlen($req)."\r\n";
 		$http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
 		$http_request .= "\r\n";
 		$http_request .= $req;
 
 		$response = '';
-		if(false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10)))
+		if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10)))
 			die('Could not open socket');
 
 		fwrite($fs, $http_request);

Braces +43 added lines, -30 removed lines

@@ -167,12 +167,15 @@ 
 	public function getClientSideOptions()
 	{
 		$options = [];
-		if ($theme = $this->getThemeName())
-			$options['theme'] = $theme;
-		if ($lang = $this->getLanguage())
-			$options['lang'] = $lang;
-		if ($trans = $this->getCustomTranslations())
-			$options['custom_translations'] = $trans;
+		if ($theme = $this->getThemeName()) {
+					$options['theme'] = $theme;
+		}
+		if ($lang = $this->getLanguage()) {
+					$options['lang'] = $lang;
+		}
+		if ($trans = $this->getCustomTranslations()) {
+					$options['custom_translations'] = $trans;
+		}
 		return $options;
 	}
 
@@ -184,8 +187,9 @@ 
 			and
 			($response = @$_POST[$this->getResponseFieldName()])
 			  )
-				   )
-		   return false;
+				   ) {
+				   return false;
+		}
 
 		return $this->recaptcha_check_answer(
 			$this->getPrivateKey(),
@@ -203,10 +207,12 @@ 
 	{
 		parent::onPreRender($param);
 
-		if("" == $this->getPublicKey())
-			throw new TConfigurationException('recaptcha_publickey_unknown');
-		if("" == $this->getPrivateKey())
-			throw new TConfigurationException('recaptcha_privatekey_unknown');
+		if("" == $this->getPublicKey()) {
+					throw new TConfigurationException('recaptcha_publickey_unknown');
+		}
+		if("" == $this->getPrivateKey()) {
+					throw new TConfigurationException('recaptcha_privatekey_unknown');
+		}
 
 		// need to register captcha fields so they will be sent back also in callbacks
 		$page = $this->getPage();
@@ -224,8 +230,9 @@ 
 	{
 		// if we're in a callback, then schedule re-rendering of the control
 		// if not, don't do anything, because a new challenge will be rendered anyway
-		if ($this->Page->IsCallback)
-			$this->Page->CallbackClient->jQuery($this->getClientID() . ' #recaptcha_reload', 'click');
+		if ($this->Page->IsCallback) {
+					$this->Page->CallbackClient->jQuery($this->getClientID() . ' #recaptcha_reload', 'click');
+		}
 	}
 
 	public function renderContents($writer)
@@ -254,8 +261,7 @@ 
 				$writer->write($html);
 
 				$cs->registerEndScript('ReCaptcha::EventScript', 'jQuery(document).ready(function() { ' . $readyscript . '; } );');
-			}
-		else
+			} else
 			{
 				$options = $this->getClientSideOptions();
 				$options['callback'] = new TJavaScriptLiteral('function() { ' . $readyscript . '; ' . $this->getCallbackScript() . '; }');
@@ -290,8 +296,9 @@ 
 	{
 		$server = $use_ssl ? self::RECAPTCHA_API_SECURE_SERVER : $server = self::RECAPTCHA_API_SERVER;
 		$errorpart = '';
-		if ($error)
-			$errorpart = "&error=" . $error;
+		if ($error) {
+					$errorpart = "&error=" . $error;
+		}
 
 		return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 		<noscript>
@@ -308,8 +315,9 @@ 
 	 */
 	private function recaptcha_qsencode ($data) {
 		$req = "";
-		foreach ($data as $key => $value)
-			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+		foreach ($data as $key => $value) {
+					$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+		}
 
 		// Cut the last '&'
 		$req = substr($req, 0, strlen($req) - 1);
@@ -337,13 +345,16 @@ 
 		$http_request .= $req;
 
 		$response = '';
-		if(false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10)))
-			die('Could not open socket');
+		if(false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
+					die('Could not open socket');
+		}
 
 		fwrite($fs, $http_request);
 
-		while (!feof($fs))
-			$response .= fgets($fs, 1160); // One TCP-IP packet
+		while (!feof($fs)) {
+					$response .= fgets($fs, 1160);
+		}
+		// One TCP-IP packet
 		fclose($fs);
 		$response = explode("\r\n\r\n", $response, 2);
 
@@ -362,8 +373,9 @@ 
 	private function recaptcha_check_answer($privkey, $remoteip, $challenge, $response, $extra_params = [])
 	{
 		//discard spam submissions
-		if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0)
-			return false;
+		if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+					return false;
+		}
 
 		$response = $this->recaptcha_http_post(self::RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
 		[
@@ -376,9 +388,10 @@ 
 
 		$answers = explode("\n", $response [1]);
 
-		if (trim($answers [0]) == 'true')
-			return true;
-		else
-			return false;
+		if (trim($answers [0]) == 'true') {
+					return true;
+		} else {
+					return false;
+		}
 	}
 }

framework/Web/UI/WebControls/TFont.php

Spacing +46 added lines, -46 removed lines

@@ -88,7 +88,7 @@ 
 	public function setBold($value)
 	{
 		$this->_flags |= self::IS_SET_BOLD;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_BOLD;
 		else
 			$this->_flags &= ~self::IS_BOLD;
@@ -108,7 +108,7 @@ 
 	public function setItalic($value)
 	{
 		$this->_flags |= self::IS_SET_ITALIC;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_ITALIC;
 		else
 			$this->_flags &= ~self::IS_ITALIC;
@@ -128,7 +128,7 @@ 
 	public function setOverline($value)
 	{
 		$this->_flags |= self::IS_SET_OVERLINE;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_OVERLINE;
 		else
 			$this->_flags &= ~self::IS_OVERLINE;
@@ -165,7 +165,7 @@ 
 	public function setStrikeout($value)
 	{
 		$this->_flags |= self::IS_SET_STRIKEOUT;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_STRIKEOUT;
 		else
 			$this->_flags &= ~self::IS_STRIKEOUT;
@@ -185,7 +185,7 @@ 
 	public function setUnderline($value)
 	{
 		$this->_flags |= self::IS_SET_UNDERLINE;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_UNDERLINE;
 		else
 			$this->_flags &= ~self::IS_UNDERLINE;
@@ -234,21 +234,21 @@ 
 	 */
 	public function mergeWith($font)
 	{
-		if($font === null || $font->_flags === 0)
+		if ($font === null || $font->_flags === 0)
 			return;
-		if(!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD))
+		if (!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD))
 			$this->setBold($font->getBold());
-		if(!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC))
+		if (!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC))
 			$this->setItalic($font->getItalic());
-		if(!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE))
+		if (!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE))
 			$this->setOverline($font->getOverline());
-		if(!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT))
+		if (!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT))
 			$this->setStrikeout($font->getStrikeout());
-		if(!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE))
+		if (!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE))
 			$this->setUnderline($font->getUnderline());
-		if(!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE))
+		if (!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE))
 			$this->setSize($font->getSize());
-		if(!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME))
+		if (!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME))
 			$this->setName($font->getName());
 	}
 
@@ -260,21 +260,21 @@ 
 	 */
 	public function copyFrom($font)
 	{
-		if($font === null || $font->_flags === 0)
+		if ($font === null || $font->_flags === 0)
 			return;
-		if($font->_flags & self::IS_SET_BOLD)
+		if ($font->_flags & self::IS_SET_BOLD)
 			$this->setBold($font->getBold());
-		if($font->_flags & self::IS_SET_ITALIC)
+		if ($font->_flags & self::IS_SET_ITALIC)
 			$this->setItalic($font->getItalic());
-		if($font->_flags & self::IS_SET_OVERLINE)
+		if ($font->_flags & self::IS_SET_OVERLINE)
 			$this->setOverline($font->getOverline());
-		if($font->_flags & self::IS_SET_STRIKEOUT)
+		if ($font->_flags & self::IS_SET_STRIKEOUT)
 			$this->setStrikeout($font->getStrikeout());
-		if($font->_flags & self::IS_SET_UNDERLINE)
+		if ($font->_flags & self::IS_SET_UNDERLINE)
 			$this->setUnderline($font->getUnderline());
-		if($font->_flags & self::IS_SET_SIZE)
+		if ($font->_flags & self::IS_SET_SIZE)
 			$this->setSize($font->getSize());
-		if($font->_flags & self::IS_SET_NAME)
+		if ($font->_flags & self::IS_SET_NAME)
 			$this->setName($font->getName());
 	}
 
@@ -283,27 +283,27 @@ 
 	 */
 	public function toString()
 	{
-		if($this->_flags === 0)
+		if ($this->_flags === 0)
 			return '';
 		$str = '';
-		if($this->_flags & self::IS_SET_BOLD)
-			$str .= 'font-weight:' . (($this->_flags & self::IS_BOLD)?'bold;':'normal;');
-		if($this->_flags & self::IS_SET_ITALIC)
-			$str .= 'font-style:' . (($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+		if ($this->_flags & self::IS_SET_BOLD)
+			$str .= 'font-weight:'.(($this->_flags & self::IS_BOLD) ? 'bold;' : 'normal;');
+		if ($this->_flags & self::IS_SET_ITALIC)
+			$str .= 'font-style:'.(($this->_flags & self::IS_ITALIC) ? 'italic;' : 'normal;');
 		$textDec = '';
-		if($this->_flags & self::IS_UNDERLINE)
+		if ($this->_flags & self::IS_UNDERLINE)
 			$textDec .= 'underline';
-		if($this->_flags & self::IS_OVERLINE)
+		if ($this->_flags & self::IS_OVERLINE)
 			$textDec .= ' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
+		if ($this->_flags & self::IS_STRIKEOUT)
 			$textDec .= ' line-through';
 		$textDec = ltrim($textDec);
-		if($textDec !== '')
-			$str .= 'text-decoration:' . $textDec . ';';
-		if($this->_size !== '')
-			$str .= 'font-size:' . $this->_size . ';';
-		if($this->_name !== '')
-			$str .= 'font-family:' . $this->_name . ';';
+		if ($textDec !== '')
+			$str .= 'text-decoration:'.$textDec.';';
+		if ($this->_size !== '')
+			$str .= 'font-size:'.$this->_size.';';
+		if ($this->_name !== '')
+			$str .= 'font-family:'.$this->_name.';';
 		return $str;
 	}
 
@@ -313,25 +313,25 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if($this->_flags === 0)
+		if ($this->_flags === 0)
 			return;
-		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD)?'bold':'normal'));
-		if($this->_flags & self::IS_SET_ITALIC)
-			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+		if ($this->_flags & self::IS_SET_BOLD)
+			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD) ? 'bold' : 'normal'));
+		if ($this->_flags & self::IS_SET_ITALIC)
+			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC) ? 'italic' : 'normal'));
 		$textDec = '';
-		if($this->_flags & self::IS_UNDERLINE)
+		if ($this->_flags & self::IS_UNDERLINE)
 			$textDec .= 'underline';
-		if($this->_flags & self::IS_OVERLINE)
+		if ($this->_flags & self::IS_OVERLINE)
 			$textDec .= ' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
+		if ($this->_flags & self::IS_STRIKEOUT)
 			$textDec .= ' line-through';
 		$textDec = ltrim($textDec);
-		if($textDec !== '')
+		if ($textDec !== '')
 			$writer->addStyleAttribute('text-decoration', $textDec);
-		if($this->_size !== '')
+		if ($this->_size !== '')
 			$writer->addStyleAttribute('font-size', $this->_size);
-		if($this->_name !== '')
+		if ($this->_name !== '')
 			$writer->addStyleAttribute('font-family', $this->_name);
 	}
 }

Braces +136 added lines, -94 removed lines

@@ -66,12 +66,15 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_flags === 0)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_flags";
-		if ($this->_name === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_name";
-		if ($this->_size === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_size";
+		if ($this->_flags === 0) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_flags";
+		}
+		if ($this->_name === '') {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_name";
+		}
+		if ($this->_size === '') {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_size";
+		}
 	}
 
 	/**
@@ -88,10 +91,11 @@ 
 	public function setBold($value)
 	{
 		$this->_flags |= self::IS_SET_BOLD;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_BOLD;
-		else
-			$this->_flags &= ~self::IS_BOLD;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_BOLD;
+		} else {
+					$this->_flags &= ~self::IS_BOLD;
+		}
 	}
 
 	/**
@@ -108,10 +112,11 @@ 
 	public function setItalic($value)
 	{
 		$this->_flags |= self::IS_SET_ITALIC;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_ITALIC;
-		else
-			$this->_flags &= ~self::IS_ITALIC;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_ITALIC;
+		} else {
+					$this->_flags &= ~self::IS_ITALIC;
+		}
 	}
 
 	/**
@@ -128,10 +133,11 @@ 
 	public function setOverline($value)
 	{
 		$this->_flags |= self::IS_SET_OVERLINE;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_OVERLINE;
-		else
-			$this->_flags &= ~self::IS_OVERLINE;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_OVERLINE;
+		} else {
+					$this->_flags &= ~self::IS_OVERLINE;
+		}
 	}
 
 	/**
@@ -165,10 +171,11 @@ 
 	public function setStrikeout($value)
 	{
 		$this->_flags |= self::IS_SET_STRIKEOUT;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_STRIKEOUT;
-		else
-			$this->_flags &= ~self::IS_STRIKEOUT;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_STRIKEOUT;
+		} else {
+					$this->_flags &= ~self::IS_STRIKEOUT;
+		}
 	}
 
 	/**
@@ -185,10 +192,11 @@ 
 	public function setUnderline($value)
 	{
 		$this->_flags |= self::IS_SET_UNDERLINE;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_UNDERLINE;
-		else
-			$this->_flags &= ~self::IS_UNDERLINE;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_UNDERLINE;
+		} else {
+					$this->_flags &= ~self::IS_UNDERLINE;
+		}
 	}
 
 	/**
@@ -234,22 +242,30 @@ 
 	 */
 	public function mergeWith($font)
 	{
-		if($font === null || $font->_flags === 0)
-			return;
-		if(!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD))
-			$this->setBold($font->getBold());
-		if(!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC))
-			$this->setItalic($font->getItalic());
-		if(!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE))
-			$this->setOverline($font->getOverline());
-		if(!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT))
-			$this->setStrikeout($font->getStrikeout());
-		if(!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE))
-			$this->setUnderline($font->getUnderline());
-		if(!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE))
-			$this->setSize($font->getSize());
-		if(!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME))
-			$this->setName($font->getName());
+		if($font === null || $font->_flags === 0) {
+					return;
+		}
+		if(!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD)) {
+					$this->setBold($font->getBold());
+		}
+		if(!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC)) {
+					$this->setItalic($font->getItalic());
+		}
+		if(!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE)) {
+					$this->setOverline($font->getOverline());
+		}
+		if(!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT)) {
+					$this->setStrikeout($font->getStrikeout());
+		}
+		if(!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE)) {
+					$this->setUnderline($font->getUnderline());
+		}
+		if(!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE)) {
+					$this->setSize($font->getSize());
+		}
+		if(!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME)) {
+					$this->setName($font->getName());
+		}
 	}
 
 	/**
@@ -260,22 +276,30 @@ 
 	 */
 	public function copyFrom($font)
 	{
-		if($font === null || $font->_flags === 0)
-			return;
-		if($font->_flags & self::IS_SET_BOLD)
-			$this->setBold($font->getBold());
-		if($font->_flags & self::IS_SET_ITALIC)
-			$this->setItalic($font->getItalic());
-		if($font->_flags & self::IS_SET_OVERLINE)
-			$this->setOverline($font->getOverline());
-		if($font->_flags & self::IS_SET_STRIKEOUT)
-			$this->setStrikeout($font->getStrikeout());
-		if($font->_flags & self::IS_SET_UNDERLINE)
-			$this->setUnderline($font->getUnderline());
-		if($font->_flags & self::IS_SET_SIZE)
-			$this->setSize($font->getSize());
-		if($font->_flags & self::IS_SET_NAME)
-			$this->setName($font->getName());
+		if($font === null || $font->_flags === 0) {
+					return;
+		}
+		if($font->_flags & self::IS_SET_BOLD) {
+					$this->setBold($font->getBold());
+		}
+		if($font->_flags & self::IS_SET_ITALIC) {
+					$this->setItalic($font->getItalic());
+		}
+		if($font->_flags & self::IS_SET_OVERLINE) {
+					$this->setOverline($font->getOverline());
+		}
+		if($font->_flags & self::IS_SET_STRIKEOUT) {
+					$this->setStrikeout($font->getStrikeout());
+		}
+		if($font->_flags & self::IS_SET_UNDERLINE) {
+					$this->setUnderline($font->getUnderline());
+		}
+		if($font->_flags & self::IS_SET_SIZE) {
+					$this->setSize($font->getSize());
+		}
+		if($font->_flags & self::IS_SET_NAME) {
+					$this->setName($font->getName());
+		}
 	}
 
 	/**
@@ -283,27 +307,36 @@ 
 	 */
 	public function toString()
 	{
-		if($this->_flags === 0)
-			return '';
+		if($this->_flags === 0) {
+					return '';
+		}
 		$str = '';
-		if($this->_flags & self::IS_SET_BOLD)
-			$str .= 'font-weight:' . (($this->_flags & self::IS_BOLD)?'bold;':'normal;');
-		if($this->_flags & self::IS_SET_ITALIC)
-			$str .= 'font-style:' . (($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+		if($this->_flags & self::IS_SET_BOLD) {
+					$str .= 'font-weight:' . (($this->_flags & self::IS_BOLD)?'bold;':'normal;');
+		}
+		if($this->_flags & self::IS_SET_ITALIC) {
+					$str .= 'font-style:' . (($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+		}
 		$textDec = '';
-		if($this->_flags & self::IS_UNDERLINE)
-			$textDec .= 'underline';
-		if($this->_flags & self::IS_OVERLINE)
-			$textDec .= ' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
-			$textDec .= ' line-through';
+		if($this->_flags & self::IS_UNDERLINE) {
+					$textDec .= 'underline';
+		}
+		if($this->_flags & self::IS_OVERLINE) {
+					$textDec .= ' overline';
+		}
+		if($this->_flags & self::IS_STRIKEOUT) {
+					$textDec .= ' line-through';
+		}
 		$textDec = ltrim($textDec);
-		if($textDec !== '')
-			$str .= 'text-decoration:' . $textDec . ';';
-		if($this->_size !== '')
-			$str .= 'font-size:' . $this->_size . ';';
-		if($this->_name !== '')
-			$str .= 'font-family:' . $this->_name . ';';
+		if($textDec !== '') {
+					$str .= 'text-decoration:' . $textDec . ';';
+		}
+		if($this->_size !== '') {
+					$str .= 'font-size:' . $this->_size . ';';
+		}
+		if($this->_name !== '') {
+					$str .= 'font-family:' . $this->_name . ';';
+		}
 		return $str;
 	}
 
@@ -313,25 +346,34 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if($this->_flags === 0)
-			return;
-		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD)?'bold':'normal'));
-		if($this->_flags & self::IS_SET_ITALIC)
-			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+		if($this->_flags === 0) {
+					return;
+		}
+		if($this->_flags & self::IS_SET_BOLD) {
+					$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD)?'bold':'normal'));
+		}
+		if($this->_flags & self::IS_SET_ITALIC) {
+					$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+		}
 		$textDec = '';
-		if($this->_flags & self::IS_UNDERLINE)
-			$textDec .= 'underline';
-		if($this->_flags & self::IS_OVERLINE)
-			$textDec .= ' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
-			$textDec .= ' line-through';
+		if($this->_flags & self::IS_UNDERLINE) {
+					$textDec .= 'underline';
+		}
+		if($this->_flags & self::IS_OVERLINE) {
+					$textDec .= ' overline';
+		}
+		if($this->_flags & self::IS_STRIKEOUT) {
+					$textDec .= ' line-through';
+		}
 		$textDec = ltrim($textDec);
-		if($textDec !== '')
-			$writer->addStyleAttribute('text-decoration', $textDec);
-		if($this->_size !== '')
-			$writer->addStyleAttribute('font-size', $this->_size);
-		if($this->_name !== '')
-			$writer->addStyleAttribute('font-family', $this->_name);
+		if($textDec !== '') {
+					$writer->addStyleAttribute('text-decoration', $textDec);
+		}
+		if($this->_size !== '') {
+					$writer->addStyleAttribute('font-size', $this->_size);
+		}
+		if($this->_name !== '') {
+					$writer->addStyleAttribute('font-family', $this->_name);
+		}
 	}
 }

framework/Web/UI/WebControls/TDatePicker.php

Spacing +58 added lines, -58 removed lines

@@ -301,7 +301,7 @@ 
 	 */
 	public function getTimeStamp()
 	{
-		if(trim($this->getText()) === '')
+		if (trim($this->getText()) === '')
 			return null;
 		else
 			return $this->getTimeStampFromText();
@@ -313,7 +313,7 @@ 
 	 */
 	public function setTimeStamp($value)
 	{
-		if($value === null || (is_string($value) && trim($value) === ''))
+		if ($value === null || (is_string($value) && trim($value) === ''))
 			$this->setText('');
 		else
 		{
@@ -377,7 +377,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript === null)
+		if ($this->_clientScript === null)
 			$this->_clientScript = $this->createClientScript();
 		return $this->_clientScript;
 	}
@@ -397,7 +397,7 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if (($text = $this->getText()) === '')
 			return '';
 		$date = $this->getTimeStamp();
 		return $date == null ? $text : $date;
@@ -421,7 +421,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if ($this->getInputMode() == TDatePickerInputMode::TextBox)
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
@@ -429,7 +429,7 @@ 
 		else
 		{
 			$this->renderDropDownListCalendar($writer);
-			if($this->hasDayPattern())
+			if ($this->hasDayPattern())
 			{
 				$this->renderClientControlScript($writer);
 				$this->renderDatePickerButtons($writer);
@@ -442,7 +442,7 @@ 
 	 */
 	protected function renderDatePickerButtons($writer)
 	{
-		if($this->getShowCalendar())
+		if ($this->getShowCalendar())
 		{
 			switch ($this->getMode())
 			{
@@ -466,10 +466,10 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if ($this->getInputMode() == TDatePickerInputMode::TextBox)
 			return parent::loadPostData($key, $values);
 		$value = $this->getDateFromPostData($key, $values);
-		if(!$this->getReadOnly() && $this->getText() !== $value)
+		if (!$this->getReadOnly() && $this->getText() !== $value)
 		{
 			$this->setText($value);
 			return true;
@@ -489,26 +489,26 @@ 
 		$date = @getdate();
 
 		$pattern = $this->getDateFormat();
-		$pattern = str_replace(['MMMM', 'MMM'], ['MM','MM'], $pattern);
+		$pattern = str_replace(['MMMM', 'MMM'], ['MM', 'MM'], $pattern);
 		$formatter = new TSimpleDateFormatter($pattern);
 
 		$order = $formatter->getDayMonthYearOrdering();
 
-		if(isset($values[$key . '$day'])) {
-			$day = intval($values[$key . '$day']);
-		} elseif(in_array('day', $order)) {
+		if (isset($values[$key.'$day'])) {
+			$day = intval($values[$key.'$day']);
+		} elseif (in_array('day', $order)) {
 			$day = $date['mday'];
 		} else {
 			$day = 1;
 		}
 
-		if(isset($values[$key . '$month']))
-			$month = intval($values[$key . '$month']) + 1;
+		if (isset($values[$key.'$month']))
+			$month = intval($values[$key.'$month']) + 1;
 		else
 			$month = $date['mon'];
 
-		if(isset($values[$key . '$year']))
-			$year = intval($values[$key . '$year']);
+		if (isset($values[$key.'$year']))
+			$year = intval($values[$key.'$year']);
 		else
 			$year = $date['year'];
 
@@ -519,7 +519,7 @@ 
 		//$date = @mktime(0, 0, 0, $month, $day, $year);
 
 		$pattern = $this->getDateFormat();
-		$pattern = str_replace(['MMMM', 'MMM'], ['MM','MM'], $pattern);
+		$pattern = str_replace(['MMMM', 'MMM'], ['MM', 'MM'], $pattern);
 
 		$formatter = new TSimpleDateFormatter($pattern);
 		return $formatter->format($date);
@@ -535,12 +535,12 @@ 
 		$options['InputMode'] = $this->getInputMode();
 		$options['Format'] = $this->getDateFormat();
 		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
-		if(($cssClass = $this->getCssClass()) !== '')
+		if (($cssClass = $this->getCssClass()) !== '')
 			$options['ClassName'] = $cssClass;
 		$options['CalendarStyle'] = $this->getCalendarStyle();
 		$options['FromYear'] = $this->getFromYear();
 		$options['UpToYear'] = $this->getUpToYear();
-		switch($this->getMode())
+		switch ($this->getMode())
 		{
 			case TDatePickerMode::Basic:
 				break;
@@ -554,7 +554,7 @@ 
 		$options['PositionMode'] = $this->getPositionMode();
 
 		$options = array_merge($options, $this->getCulturalOptions());
-		if($this->_clientScript !== null)
+		if ($this->_clientScript !== null)
 			$options = array_merge($options,
 				$this->_clientScript->getOptions()->toArray());
 		return $options;
@@ -566,7 +566,7 @@ 
 	 */
 	protected function getCulturalOptions()
 	{
-		if($this->getCurrentCulture() == 'en')
+		if ($this->getCurrentCulture() == 'en')
 			return [];
 
 		$date = $this->getLocalizedCalendarInfo();
@@ -603,14 +603,14 @@ 
 	 */
 	protected function renderDropDownListCalendar($writer)
 	{
-		if($this->getMode() == TDatePickerMode::Basic)
+		if ($this->getMode() == TDatePickerMode::Basic)
 			$this->setMode(TDatePickerMode::ImageButton);
 		parent::addAttributesToRender($writer);
 		$writer->removeAttribute('name');
 		$writer->removeAttribute('type');
 		$writer->addAttribute('id', $this->getClientID());
 
-		if(strlen($class = $this->getCssClass()) > 0)
+		if (strlen($class = $this->getCssClass()) > 0)
 			$writer->addAttribute('class', $class);
 		$writer->renderBeginTag('span');
 
@@ -643,13 +643,13 @@ 
 	{
 		$formatter = new TSimpleDateFormatter($this->getDateFormat());
 
-		foreach($formatter->getDayMonthYearOrdering() as $type)
+		foreach ($formatter->getDayMonthYearOrdering() as $type)
 		{
-			if($type == 'day')
+			if ($type == 'day')
 				$this->renderCalendarDayOptions($writer, $date->format('j'));
-			elseif($type == 'month')
+			elseif ($type == 'month')
 				$this->renderCalendarMonthOptions($writer, $date->format('n'));
-			elseif($type == 'year')
+			elseif ($type == 'year')
 				$this->renderCalendarYearOptions($writer, $date->format('Y'));
 		}
 	}
@@ -661,7 +661,7 @@ 
 	protected function getTimeStampFromText()
 	{
 		$pattern = $this->getDateFormat();
-		$pattern = str_replace(['MMMM', 'MMM'], ['MM','MM'], $pattern);
+		$pattern = str_replace(['MMMM', 'MMM'], ['MM', 'MM'], $pattern);
 		$formatter = new TSimpleDateFormatter($pattern);
 		return $formatter->parse($this->getText());
 	}
@@ -674,10 +674,10 @@ 
 	 */
 	private function renderDropDownListOptions($writer, $options, $selected = null)
 	{
-		foreach($options as $k => $v)
+		foreach ($options as $k => $v)
 		{
 			$writer->addAttribute('value', $k);
-			if($k == $selected)
+			if ($k == $selected)
 				$writer->addAttribute('selected', 'selected');
 			$writer->renderBeginTag('option');
 			$writer->write($v);
@@ -693,10 +693,10 @@ 
 	protected function renderCalendarDayOptions($writer, $selected = null)
 	{
 		$days = $this->getDropDownDayOptions();
-		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'day');
-		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'day');
+		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'day');
+		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'day');
 		$writer->addAttribute('class', 'datepicker_day_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
+		if ($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $days, $selected);
@@ -711,7 +711,7 @@ 
 		$formatter = new TSimpleDateFormatter($this->getDateFormat());
 		$days = [];
 		$requiresPadding = $formatter->getDayPattern() === 'dd';
-		for($i = 1;$i <= 31;$i++)
+		for ($i = 1; $i <= 31; $i++)
 		{
 			$days[$i] = $requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
 		}
@@ -726,10 +726,10 @@ 
 	protected function renderCalendarMonthOptions($writer, $selected = null)
 	{
 		$info = $this->getLocalizedCalendarInfo();
-		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'month');
-		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'month');
+		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'month');
+		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'month');
 		$writer->addAttribute('class', 'datepicker_month_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
+		if ($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer,
@@ -747,16 +747,16 @@ 
 	protected function getLocalizedMonthNames($info)
 	{
 		$formatter = new TSimpleDateFormatter($this->getDateFormat());
-		switch($formatter->getMonthPattern())
+		switch ($formatter->getMonthPattern())
 		{
 			case 'MMM': return $info->getAbbreviatedMonthNames();
 			case 'MM':
 				$array = [];
-				for($i = 1;$i <= 12;$i++)
-						$array[$i - 1] = $i < 10 ? '0' . $i : $i;
+				for ($i = 1; $i <= 12; $i++)
+						$array[$i - 1] = $i < 10 ? '0'.$i : $i;
 				return $array;
 			case 'M':
-				$array = []; for($i = 1;$i <= 12;$i++) $array[$i - 1] = $i;
+				$array = []; for ($i = 1; $i <= 12; $i++) $array[$i - 1] = $i;
 				return $array;
 			default :	return $info->getMonthNames();
 		}
@@ -770,12 +770,12 @@ 
 	protected function renderCalendarYearOptions($writer, $selected = null)
 	{
 		$years = [];
-		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
+		for ($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
 			$years[$i] = $i;
-		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'year');
-		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'year');
+		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'year');
+		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'year');
 		$writer->addAttribute('class', 'datepicker_year_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
+		if ($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $years, $selected);
@@ -788,7 +788,7 @@ 
 	 */
 	protected function getDatePickerButtonID()
 	{
-		return $this->getClientID() . 'button';
+		return $this->getClientID().'button';
 	}
 
 	/**
@@ -799,9 +799,9 @@ 
 	{
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('type', 'button');
-		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerButton');
+		$writer->addAttribute('class', $this->getCssClass().' TDatePickerButton');
 		$writer->addAttribute('value', $this->getButtonText());
-		if(!$this->getEnabled(true))
+		if (!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag("input");
 		$writer->renderEndTag();
@@ -818,8 +818,8 @@ 
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('src', $url);
 		$writer->addAttribute('alt', ' ');
-		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerImageButton');
-		if(!$this->getEnabled(true))
+		$writer->addAttribute('class', $this->getCssClass().' TDatePickerImageButton');
+		if (!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->addAttribute('type', 'image');
 		$writer->addAttribute('onclick', 'return false;');
@@ -834,7 +834,7 @@ 
 	protected function getAssetUrl($file = '')
 	{
 		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
-		return $base . '/' . self::SCRIPT_PATH . '/' . $file;
+		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
 	/**
@@ -843,9 +843,9 @@ 
 	 */
 	protected function publishCalendarStyle()
 	{
-		$url = $this->getAssetUrl($this->getCalendarStyle() . '.css');
+		$url = $this->getAssetUrl($this->getCalendarStyle().'.css');
 		$cs = $this->getPage()->getClientScript();
-		if(!$cs->isStyleSheetFileRegistered($url))
+		if (!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
 	}
@@ -865,7 +865,7 @@ 
 	 */
 	protected function registerCalendarClientScriptPre()
 	{
-		if($this->getShowCalendar())
+		if ($this->getShowCalendar())
 		{
 			$cs = $this->getPage()->getClientScript();
 			$cs->registerPradoScript("datepicker");
@@ -874,10 +874,10 @@ 
 
 	protected function renderClientControlScript($writer)
 	{
-		if($this->getShowCalendar())
+		if ($this->getShowCalendar())
 		{
 			$cs = $this->getPage()->getClientScript();
-			if(!$cs->isEndScriptRegistered('TDatePicker.spacer'))
+			if (!$cs->isEndScriptRegistered('TDatePicker.spacer'))
 			{
 				$spacer = $this->getAssetUrl('spacer.gif');
 				$code = "Prado.WebUI.TDatePicker.spacer = '$spacer';";
@@ -886,7 +886,7 @@ 
 
 			$options = TJavaScript::encode($this->getDatePickerOptions());
 			$code = "new Prado.WebUI.TDatePicker($options);";
-			$cs->registerEndScript("prado:" . $this->getClientID(), $code);
+			$cs->registerEndScript("prado:".$this->getClientID(), $code);
 		}
 	}
 }
\ No newline at end of file

Braces +82 added lines, -60 removed lines

@@ -301,10 +301,11 @@ 
 	 */
 	public function getTimeStamp()
 	{
-		if(trim($this->getText()) === '')
-			return null;
-		else
-			return $this->getTimeStampFromText();
+		if(trim($this->getText()) === '') {
+					return null;
+		} else {
+					return $this->getTimeStampFromText();
+		}
 	}
 
 	/**
@@ -313,9 +314,9 @@ 
 	 */
 	public function setTimeStamp($value)
 	{
-		if($value === null || (is_string($value) && trim($value) === ''))
-			$this->setText('');
-		else
+		if($value === null || (is_string($value) && trim($value) === '')) {
+					$this->setText('');
+		} else
 		{
 			$date = TPropertyValue::ensureFloat($value);
 			$formatter = new TSimpleDateFormatter($this->getDateFormat());
@@ -377,8 +378,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript === null)
-			$this->_clientScript = $this->createClientScript();
+		if($this->_clientScript === null) {
+					$this->_clientScript = $this->createClientScript();
+		}
 		return $this->_clientScript;
 	}
 
@@ -397,8 +399,9 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
-			return '';
+		if(($text = $this->getText()) === '') {
+					return '';
+		}
 		$date = $this->getTimeStamp();
 		return $date == null ? $text : $date;
 	}
@@ -425,8 +428,7 @@ 
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
-		}
-		else
+		} else
 		{
 			$this->renderDropDownListCalendar($writer);
 			if($this->hasDayPattern())
@@ -466,16 +468,17 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
-			return parent::loadPostData($key, $values);
+		if($this->getInputMode() == TDatePickerInputMode::TextBox) {
+					return parent::loadPostData($key, $values);
+		}
 		$value = $this->getDateFromPostData($key, $values);
 		if(!$this->getReadOnly() && $this->getText() !== $value)
 		{
 			$this->setText($value);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -502,15 +505,17 @@ 
 			$day = 1;
 		}
 
-		if(isset($values[$key . '$month']))
-			$month = intval($values[$key . '$month']) + 1;
-		else
-			$month = $date['mon'];
+		if(isset($values[$key . '$month'])) {
+					$month = intval($values[$key . '$month']) + 1;
+		} else {
+					$month = $date['mon'];
+		}
 
-		if(isset($values[$key . '$year']))
-			$year = intval($values[$key . '$year']);
-		else
-			$year = $date['year'];
+		if(isset($values[$key . '$year'])) {
+					$year = intval($values[$key . '$year']);
+		} else {
+					$year = $date['year'];
+		}
 
 		$s = new \DateTime;
 		$s->setDate($year, $month, $day);
@@ -535,8 +540,9 @@ 
 		$options['InputMode'] = $this->getInputMode();
 		$options['Format'] = $this->getDateFormat();
 		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
-		if(($cssClass = $this->getCssClass()) !== '')
-			$options['ClassName'] = $cssClass;
+		if(($cssClass = $this->getCssClass()) !== '') {
+					$options['ClassName'] = $cssClass;
+		}
 		$options['CalendarStyle'] = $this->getCalendarStyle();
 		$options['FromYear'] = $this->getFromYear();
 		$options['UpToYear'] = $this->getUpToYear();
@@ -554,9 +560,10 @@ 
 		$options['PositionMode'] = $this->getPositionMode();
 
 		$options = array_merge($options, $this->getCulturalOptions());
-		if($this->_clientScript !== null)
-			$options = array_merge($options,
+		if($this->_clientScript !== null) {
+					$options = array_merge($options,
 				$this->_clientScript->getOptions()->toArray());
+		}
 		return $options;
 	}
 
@@ -566,8 +573,9 @@ 
 	 */
 	protected function getCulturalOptions()
 	{
-		if($this->getCurrentCulture() == 'en')
-			return [];
+		if($this->getCurrentCulture() == 'en') {
+					return [];
+		}
 
 		$date = $this->getLocalizedCalendarInfo();
 		$options['MonthNames'] = $date->getMonthNames();
@@ -603,15 +611,17 @@ 
 	 */
 	protected function renderDropDownListCalendar($writer)
 	{
-		if($this->getMode() == TDatePickerMode::Basic)
-			$this->setMode(TDatePickerMode::ImageButton);
+		if($this->getMode() == TDatePickerMode::Basic) {
+					$this->setMode(TDatePickerMode::ImageButton);
+		}
 		parent::addAttributesToRender($writer);
 		$writer->removeAttribute('name');
 		$writer->removeAttribute('type');
 		$writer->addAttribute('id', $this->getClientID());
 
-		if(strlen($class = $this->getCssClass()) > 0)
-			$writer->addAttribute('class', $class);
+		if(strlen($class = $this->getCssClass()) > 0) {
+					$writer->addAttribute('class', $class);
+		}
 		$writer->renderBeginTag('span');
 
 		$date = new \DateTime;
@@ -645,12 +655,13 @@ 
 
 		foreach($formatter->getDayMonthYearOrdering() as $type)
 		{
-			if($type == 'day')
-				$this->renderCalendarDayOptions($writer, $date->format('j'));
-			elseif($type == 'month')
-				$this->renderCalendarMonthOptions($writer, $date->format('n'));
-			elseif($type == 'year')
-				$this->renderCalendarYearOptions($writer, $date->format('Y'));
+			if($type == 'day') {
+							$this->renderCalendarDayOptions($writer, $date->format('j'));
+			} elseif($type == 'month') {
+							$this->renderCalendarMonthOptions($writer, $date->format('n'));
+			} elseif($type == 'year') {
+							$this->renderCalendarYearOptions($writer, $date->format('Y'));
+			}
 		}
 	}
 
@@ -677,8 +688,9 @@ 
 		foreach($options as $k => $v)
 		{
 			$writer->addAttribute('value', $k);
-			if($k == $selected)
-				$writer->addAttribute('selected', 'selected');
+			if($k == $selected) {
+							$writer->addAttribute('selected', 'selected');
+			}
 			$writer->renderBeginTag('option');
 			$writer->write($v);
 			$writer->renderEndTag();
@@ -696,8 +708,9 @@ 
 		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'day');
 		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'day');
 		$writer->addAttribute('class', 'datepicker_day_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getReadOnly() || !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $days, $selected);
 		$writer->renderEndTag();
@@ -729,8 +742,9 @@ 
 		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'month');
 		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'month');
 		$writer->addAttribute('class', 'datepicker_month_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getReadOnly() || !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer,
 					$this->getLocalizedMonthNames($info), $selected - 1);
@@ -752,11 +766,14 @@ 
 			case 'MMM': return $info->getAbbreviatedMonthNames();
 			case 'MM':
 				$array = [];
-				for($i = 1;$i <= 12;$i++)
-						$array[$i - 1] = $i < 10 ? '0' . $i : $i;
+				for($i = 1;$i <= 12;$i++) {
+										$array[$i - 1] = $i < 10 ? '0' . $i : $i;
+				}
 				return $array;
 			case 'M':
-				$array = []; for($i = 1;$i <= 12;$i++) $array[$i - 1] = $i;
+				$array = []; for($i = 1;$i <= 12;$i++) {
+					$array[$i - 1] = $i;
+				}
 				return $array;
 			default :	return $info->getMonthNames();
 		}
@@ -770,13 +787,15 @@ 
 	protected function renderCalendarYearOptions($writer, $selected = null)
 	{
 		$years = [];
-		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
-			$years[$i] = $i;
+		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++) {
+					$years[$i] = $i;
+		}
 		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'year');
 		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'year');
 		$writer->addAttribute('class', 'datepicker_year_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getReadOnly() || !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $years, $selected);
 		$writer->renderEndTag();
@@ -801,8 +820,9 @@ 
 		$writer->addAttribute('type', 'button');
 		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerButton');
 		$writer->addAttribute('value', $this->getButtonText());
-		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if(!$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag("input");
 		$writer->renderEndTag();
 	}
@@ -819,8 +839,9 @@ 
 		$writer->addAttribute('src', $url);
 		$writer->addAttribute('alt', ' ');
 		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerImageButton');
-		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if(!$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->addAttribute('type', 'image');
 		$writer->addAttribute('onclick', 'return false;');
 		$writer->renderBeginTag('input');
@@ -845,8 +866,9 @@ 
 	{
 		$url = $this->getAssetUrl($this->getCalendarStyle() . '.css');
 		$cs = $this->getPage()->getClientScript();
-		if(!$cs->isStyleSheetFileRegistered($url))
-			$cs->registerStyleSheetFile($url, $url);
+		if(!$cs->isStyleSheetFileRegistered($url)) {
+					$cs->registerStyleSheetFile($url, $url);
+		}
 		return $url;
 	}
 

framework/Web/UI/WebControls/TImageButton.php

Spacing +8 added lines, -8 removed lines

@@ -100,14 +100,14 @@ 
 		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
 		$writer->addAttribute('type', 'image');
-		if(($uniqueID = $this->getUniqueID()) !== '')
+		if (($uniqueID = $this->getUniqueID()) !== '')
 			$writer->addAttribute('name', $uniqueID);
-		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);
 	}
@@ -137,7 +137,7 @@ 
 	 */
 	protected function canCauseValidation()
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
@@ -195,11 +195,11 @@ 
 	public function loadPostData($key, $values)
 	{
 		$uid = $this->getUniqueID();
-		if(isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
+		if (isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
 		{
 			$this->_x = intval($values["{$uid}_x"]);
 			$this->_y = intval($values["{$uid}_y"]);
-			if($this->getPage()->getPostBackEventTarget() === null)
+			if ($this->getPage()->getPostBackEventTarget() === null)
 				$this->getPage()->setPostBackEventTarget($this);
 			$this->_dataChanged = true;
 		}
@@ -250,7 +250,7 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
 		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));

Braces +17 added lines, -12 removed lines

@@ -100,15 +100,18 @@ 
 		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
 		$writer->addAttribute('type', 'image');
-		if(($uniqueID = $this->getUniqueID()) !== '')
-			$writer->addAttribute('name', $uniqueID);
+		if(($uniqueID = $this->getUniqueID()) !== '') {
+					$writer->addAttribute('name', $uniqueID);
+		}
 		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);
 	}
 
@@ -141,9 +144,9 @@ 
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -199,8 +202,9 @@ 
 		{
 			$this->_x = intval($values["{$uid}_x"]);
 			$this->_y = intval($values["{$uid}_y"]);
-			if($this->getPage()->getPostBackEventTarget() === null)
-				$this->getPage()->setPostBackEventTarget($this);
+			if($this->getPage()->getPostBackEventTarget() === null) {
+							$this->getPage()->setPostBackEventTarget($this);
+			}
 			$this->_dataChanged = true;
 		}
 		return false;
@@ -250,8 +254,9 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
 		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}

framework/Web/UI/WebControls/TFileUpload.php

Spacing +18 added lines, -18 removed lines

@@ -86,14 +86,14 @@ 
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('type', 'file');
 		$name = $this->getUniqueID();
-		if($this->getMultiple())
+		if ($this->getMultiple())
 		{
 		  $name .= '[]';
 		  $writer->addAttribute('multiple', 'multiple');
 		}
 		$writer->addAttribute('name', $name);
 		$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');
 	}
 
@@ -105,15 +105,15 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(($form = $this->getPage()->getForm()) !== null)
+		if (($form = $this->getPage()->getForm()) !== null)
 		{
-			if($this->getPage()->getIsCallback())
+			if ($this->getPage()->getIsCallback())
 				$this->getPage()->getCallbackClient()->setAttribute($form, 'enctype', 'multipart/form-data');
 			else
 				$form->setEnctype('multipart/form-data');
 		}
 		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE', $this->getMaxFileSize());
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 			$this->getPage()->registerRequiresPostData($this);
 	}
 
@@ -146,7 +146,7 @@ 
 	 */
 	public function getFileName($index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->getFileName():'';
+	  return isset($this->_files[$index]) ? $this->_files[$index]->getFileName() : '';
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	public function getFileSize($index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->getFileSize():0;
+	  return isset($this->_files[$index]) ? $this->_files[$index]->getFileSize() : 0;
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getFileType($index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->getFileType():'';
+	  return isset($this->_files[$index]) ? $this->_files[$index]->getFileType() : '';
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 */
 	public function getLocalName($index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->getLocalName():'';
+	  return isset($this->_files[$index]) ? $this->_files[$index]->getLocalName() : '';
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 	 */
 	public function getErrorCode($index = 0)
 	{
-		return isset($this->_files[$index])?$this->_files[$index]->getErrorCode():UPLOAD_ERR_NO_FILE;
+		return isset($this->_files[$index]) ? $this->_files[$index]->getErrorCode() : UPLOAD_ERR_NO_FILE;
 	}
 
 	/**
@@ -200,7 +200,7 @@ 
 	 */
 	public function getHasFile($index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->getHasFile():false;
+	  return isset($this->_files[$index]) ? $this->_files[$index]->getHasFile() : false;
 	}
 
 	/**
@@ -208,8 +208,8 @@ 
 	 * @return boolean whether all files are uploaded successfully
 	 */
 	public function getHasAllFiles() {
-	  foreach($this->_files as $file)
-		if(!$file->getHasFile())
+	  foreach ($this->_files as $file)
+		if (!$file->getHasFile())
 		  return false;
 	  return true;
 	}
@@ -226,7 +226,7 @@ 
 	 */
 	public function saveAs($fileName, $deleteTempFile = true, $index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->saveAs($fileName, $deleteTempFile):false;
+	  return isset($this->_files[$index]) ? $this->_files[$index]->saveAs($fileName, $deleteTempFile) : false;
 	}
 
 	/**
@@ -238,11 +238,11 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if(isset($_FILES[$key]))
+		if (isset($_FILES[$key]))
 		{
-		  if($this->getMultiple() || is_array($_FILES[$key]['name']))
+		  if ($this->getMultiple() || is_array($_FILES[$key]['name']))
 		  {
-		foreach($_FILES[$key]['name'] as $index => $name)
+		foreach ($_FILES[$key]['name'] as $index => $name)
 		  $this->_files[$index] = new TFileUploadItem($name, $_FILES[$key]['size'][$index], $_FILES[$key]['type'][$index], $_FILES[$key]['error'][$index], $_FILES[$key]['tmp_name'][$index]);
 		  }
 		  else
@@ -292,7 +292,7 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		return implode(',', array_map(function($file){return $file->getFileName();}, $this->_files));
+		return implode(',', array_map(function($file) {return $file->getFileName(); }, $this->_files));
 	}
 
 	/**

Braces +21 added lines, -15 removed lines

@@ -93,8 +93,10 @@ 
 		}
 		$writer->addAttribute('name', $name);
 		$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');
+		}
 	}
 
 	/**
@@ -107,14 +109,16 @@ 
 		parent::onPreRender($param);
 		if(($form = $this->getPage()->getForm()) !== null)
 		{
-			if($this->getPage()->getIsCallback())
-				$this->getPage()->getCallbackClient()->setAttribute($form, 'enctype', 'multipart/form-data');
-			else
-				$form->setEnctype('multipart/form-data');
+			if($this->getPage()->getIsCallback()) {
+							$this->getPage()->getCallbackClient()->setAttribute($form, 'enctype', 'multipart/form-data');
+			} else {
+							$form->setEnctype('multipart/form-data');
+			}
 		}
 		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE', $this->getMaxFileSize());
-		if($this->getEnabled(true))
-			$this->getPage()->registerRequiresPostData($this);
+		if($this->getEnabled(true)) {
+					$this->getPage()->registerRequiresPostData($this);
+		}
 	}
 
 	/**
@@ -208,9 +212,10 @@ 
 	 * @return boolean whether all files are uploaded successfully
 	 */
 	public function getHasAllFiles() {
-	  foreach($this->_files as $file)
-		if(!$file->getHasFile())
+	  foreach($this->_files as $file) {
+	  		if(!$file->getHasFile())
 		  return false;
+	  }
 	  return true;
 	}
 
@@ -242,15 +247,16 @@ 
 		{
 		  if($this->getMultiple() || is_array($_FILES[$key]['name']))
 		  {
-		foreach($_FILES[$key]['name'] as $index => $name)
-		  $this->_files[$index] = new TFileUploadItem($name, $_FILES[$key]['size'][$index], $_FILES[$key]['type'][$index], $_FILES[$key]['error'][$index], $_FILES[$key]['tmp_name'][$index]);
+		foreach($_FILES[$key]['name'] as $index => $name) {
+				  $this->_files[$index] = new TFileUploadItem($name, $_FILES[$key]['size'][$index], $_FILES[$key]['type'][$index], $_FILES[$key]['error'][$index], $_FILES[$key]['tmp_name'][$index]);
+		}
+		  } else {
+		  			$this->_files[0] = new TFileUploadItem($_FILES[$key]['name'], $_FILES[$key]['size'], $_FILES[$key]['type'], $_FILES[$key]['error'], $_FILES[$key]['tmp_name']);
 		  }
-		  else
-			$this->_files[0] = new TFileUploadItem($_FILES[$key]['name'], $_FILES[$key]['size'], $_FILES[$key]['type'], $_FILES[$key]['error'], $_FILES[$key]['tmp_name']);
 			return $this->_dataChanged = true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**

framework/Web/UI/WebControls/TDataGridItem.php

Spacing +3 added lines, -3 removed lines

@@ -63,9 +63,9 @@ 
 		$this->_itemIndex = $itemIndex;
 		$this->_dataSourceIndex = $dataSourceIndex;
 		$this->setItemType($itemType);
-		if($itemType === TListItemType::Header)
+		if ($itemType === TListItemType::Header)
 			$this->setTableSection(TTableRowSection::Header);
-		elseif($itemType === TListItemType::Footer)
+		elseif ($itemType === TListItemType::Footer)
 			$this->setTableSection(TTableRowSection::Footer);
 	}
 
@@ -128,7 +128,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
+		if ($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
 			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;

Braces +7 added lines, -6 removed lines

@@ -63,10 +63,11 @@ 
 		$this->_itemIndex = $itemIndex;
 		$this->_dataSourceIndex = $dataSourceIndex;
 		$this->setItemType($itemType);
-		if($itemType === TListItemType::Header)
-			$this->setTableSection(TTableRowSection::Header);
-		elseif($itemType === TListItemType::Footer)
-			$this->setTableSection(TTableRowSection::Footer);
+		if($itemType === TListItemType::Header) {
+					$this->setTableSection(TTableRowSection::Header);
+		} elseif($itemType === TListItemType::Footer) {
+					$this->setTableSection(TTableRowSection::Footer);
+		}
 	}
 
 	/**
@@ -132,8 +133,8 @@ 
 		{
 			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TListItem.php

Spacing +8 added lines, -8 removed lines

@@ -78,9 +78,9 @@ 
 		parent::_getZappableSleepProps($exprops);
 		if ($this->_attributes === null)
 			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_attributes";
-		if($this->_text === '')
+		if ($this->_text === '')
 			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_text";
-		if($this->_value === '')
+		if ($this->_value === '')
 			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_value";
 		if ($this->_enabled === true)
 			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_enabled";
@@ -125,7 +125,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->_text === ''?$this->_value:$this->_text;
+		return $this->_text === '' ? $this->_value : $this->_text;
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->_value === ''?$this->_text:$this->_value;
+		return $this->_value === '' ? $this->_text : $this->_value;
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
+		if (!$this->_attributes)
 			$this->_attributes = new TAttributeCollection;
 		return $this->_attributes;
 	}
@@ -176,7 +176,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->contains($name):false;
+		return $this->_attributes ? $this->_attributes->contains($name) : false;
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->itemAt($name):null;
+		return $this->_attributes ? $this->_attributes->itemAt($name) : null;
 	}
 
 	/**
@@ -203,7 +203,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->remove($name):null;
+		return $this->_attributes ? $this->_attributes->remove($name) : null;
 	}
 }
 

Braces +18 added lines, -12 removed lines

@@ -76,16 +76,21 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_attributes === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_attributes";
-		if($this->_text === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_text";
-		if($this->_value === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_value";
-		if ($this->_enabled === true)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_enabled";
-		if ($this->_selected === false)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_selected";
+		if ($this->_attributes === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_attributes";
+		}
+		if($this->_text === '') {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_text";
+		}
+		if($this->_value === '') {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_value";
+		}
+		if ($this->_enabled === true) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_enabled";
+		}
+		if ($this->_selected === false) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_selected";
+		}
 	}
 
 	/**
@@ -157,8 +162,9 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes = new TAttributeCollection;
+		if(!$this->_attributes) {
+					$this->_attributes = new TAttributeCollection;
+		}
 		return $this->_attributes;
 	}
 

framework/Web/UI/WebControls/TLinkButton.php

Spacing +5 added lines, -5 removed lines

@@ -98,12 +98,12 @@ 
 		// may be overwritten in the following
 		parent::addAttributesToRender($writer);
 
-		if($this->getEnabled(true) && $this->getEnableClientScript())
+		if ($this->getEnabled(true) && $this->getEnableClientScript())
 		{
 			$this->renderLinkButtonHref($writer);
 			$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');
 	}
 
@@ -140,7 +140,7 @@ 
 	protected function renderLinkButtonHref($writer)
 	{
 		//create unique no-op url references
-		$nop = "javascript:;//" . $this->getClientID();
+		$nop = "javascript:;//".$this->getClientID();
 		$writer->addAttribute('href', $nop);
 	}
 
@@ -178,7 +178,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) === '')
+		if (($text = $this->getText()) === '')
 			parent::renderContents($writer);
 		else
 			$writer->write($text);
@@ -302,7 +302,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 +11 added lines, -8 removed lines

@@ -102,9 +102,10 @@ 
 		{
 			$this->renderLinkButtonHref($writer);
 			$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');
+		}
 	}
 
 	/**
@@ -178,10 +179,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);
+		}
 	}
 
 	/**
@@ -302,8 +304,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()));
 	}