pradosoft / prado

framework/Web/UI/WebControls/TDataGrid.php

Braces +21 added lines, -42 removed lines

@@ -696,33 +696,27 @@ 
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_EDIT) === 0)
+			} elseif(strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_DELETE) === 0)
+			} elseif(strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
+			} elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
+			} elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_SORT) === 0)
+			} elseif(strcasecmp($command, self::CMD_SORT) === 0)
 			{
 				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender, $param));
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_PAGE) === 0)
+			} elseif(strcasecmp($command, self::CMD_PAGE) === 0)
 			{
 				$p = $param->getCommandParameter();
 				if(strcasecmp($p, self::CMD_PAGE_NEXT) === 0)
@@ -869,8 +863,7 @@ 
 			foreach($this->_autoColumns as $column)
 				$state[] = $column->saveState();
 			$this->setViewState('AutoColumns', $state, []);
-		}
-		else
+		} else
 			$this->clearViewState('AutoColumns');
 		if($this->_columns)
 		{
@@ -878,8 +871,7 @@ 
 			foreach($this->_columns as $column)
 				$state[] = $column->saveState();
 			$this->setViewState('Columns', $state, []);
-		}
-		else
+		} else
 			$this->clearViewState('Columns');
 	}
 
@@ -904,8 +896,7 @@ 
 					$column->loadState($st);
 					$this->_autoColumns->add($column);
 				}
-			}
-			else
+			} else
 				$this->_autoColumns = null;
 			$state = $this->getViewState('Columns', []);
 			if($this->_columns && $this->_columns->getCount() === count($state))
@@ -1011,8 +1002,7 @@ 
 			$columns = new TList($this->getColumns());
 			$autoColumns = $this->createAutoColumns($data);
 			$columns->mergeWith($autoColumns);
-		}
-		else
+		} else
 			$columns = $this->getColumns();
 		$this->_allColumns = $columns;
 
@@ -1102,8 +1092,7 @@ 
 					{
 						$prevCell = $cell;
 						$prevCellText = $cellText;
-					}
-					else
+					} else
 					{
 						if(($rowSpan = $prevCell->getRowSpan()) === 0)
 							$rowSpan = 1;
@@ -1152,8 +1141,7 @@ 
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
-		}
-		else
+		} else
 		{
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -1236,8 +1224,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			$button = new TButton;
 			if(!$enabled)
@@ -1271,8 +1258,7 @@ 
 
 			$label = $this->createPagerButton($pager, $buttonType, false, $style->getPrevPageText(), '', '');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text = $style->getFirstPageText()) !== '')
 			{
@@ -1295,8 +1281,7 @@ 
 				$label = $this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
 			}
-		}
-		else
+		} else
 		{
 			$button = $this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, self::CMD_PAGE_NEXT);
 			$controls->add($button);
@@ -1356,8 +1341,7 @@ 
 			{
 				$label = $this->createPagerButton($pager, $buttonType, false, "$i", '', '');
 				$controls->add($label);
-			}
-			else
+			} else
 			{
 				$button = $this->createPagerButton($pager, $buttonType, true, "$i", self::CMD_PAGE, "$i");
 				$controls->add($button);
@@ -1403,8 +1387,7 @@ 
 					$column->setDataField($key);
 					$column->setSortExpression($key);
 					$autoColumns->add($column);
-				}
-				else
+				} else
 				{
 					$column->setHeaderText(TListItemType::Item);
 					$column->setDataField($key);
@@ -1495,8 +1478,7 @@ 
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+					} else
 					{
 						if($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
@@ -1509,8 +1491,7 @@ 
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+					} else
 					{
 						if($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
@@ -1524,8 +1505,7 @@ 
 						{
 							if($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
 								$item->setVisible(false);
-						}
-						else
+						} else
 						{
 							if($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
 								$item->setVisible(false);
@@ -1597,8 +1577,7 @@ 
 				$control->renderBeginTag($writer);
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
-			}
-			elseif($this->getViewState('ItemCount', 0) > 0)
+			} elseif($this->getViewState('ItemCount', 0) > 0)
 			{
 				$this->applyItemStyles();
 				if($this->_topPager)

framework/Web/UI/WebControls/TFileUploadItem.php

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
 		return file_put_contents($fileName, file_get_contents($this->_localName)) !== false;
 	  else
 		return false;
-	}
-	else
+	} else
 	  return false;
   }
 

framework/Web/UI/WebControls/TTable.php

Braces +4 added lines, -8 removed lines

@@ -306,8 +306,7 @@ 
 					{
 						if($index === 0 && $currentSection === TTableRowSection::Header)
 							$writer->renderBeginTag('thead');
-					}
-					else
+					} else
 					{
 						if($currentSection === TTableRowSection::Header)
 						{
@@ -318,8 +317,7 @@ 
 							else
 								$writer->renderBeginTag('tfoot');
 							$currentSection = $section;
-						}
-						elseif($currentSection === TTableRowSection::Body)
+						} elseif($currentSection === TTableRowSection::Body)
 						{
 							$writer->renderEndTag();
 							if($section === TTableRowSection::Footer)
@@ -327,16 +325,14 @@ 
 							else
 								throw new TConfigurationException('table_tablesection_outoforder');
 							$currentSection = $section;
-						}
-						else // Footer
+						} else // Footer
 							throw new TConfigurationException('table_tablesection_outoforder');
 					}
 					$row->renderControl($writer);
 					$writer->writeLine();
 				}
 				$writer->renderEndTag();
-			}
-			else
+			} else
 			{
 				$writer->writeLine();
 				foreach($this->getControls() as $row)

framework/Web/UI/WebControls/TCaptchaValidator.php

Braces +1 added lines, -2 removed lines

@@ -108,8 +108,7 @@
 		{
 			$options['TokenHash'] = $this->generateTokenHash($control->getToken());
 			$options['CaseSensitive'] = true;
-		}
-		else
+		} else
 		{
 			$options['TokenHash'] = $this->generateTokenHash(strtoupper($control->getToken()));
 			$options['CaseSensitive'] = false;

framework/Web/UI/WebControls/TTextBox.php

Braces +2 added lines, -4 removed lines

@@ -121,8 +121,7 @@ 
 			$writer->addAttribute('cols', "$cols");
 			if(!$this->getWrap())
 				$writer->addAttribute('wrap', 'off');
-		}
-		else
+		} else
 		{
 			switch($textMode)
 			{
@@ -268,8 +267,7 @@ 
 		{
 			$this->setText($value);
 			return $this->_dataChanged = true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/TUrlManager.php

Braces +5 added lines, -10 removed lines

@@ -80,12 +80,10 @@ 
 						$name = urlencode($name . '[]');
 						foreach($value as $v)
 							$url .= $amp . $name . '=' . urlencode($v);
-					}
-					else
+					} else
 						$url .= $amp . urlencode($name) . '=' . urlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($getItems as $name => $value)
 				{
@@ -93,8 +91,7 @@ 
 					{
 						foreach($value as $v)
 							$url .= $amp . $name . '[]=' . $v;
-					}
-					else
+					} else
 						$url .= $amp . $name . '=' . $value;
 				}
 			}
@@ -147,14 +144,12 @@ 
 							$getVariables[substr($name, 0, $pos)][] = $value;
 						else
 							$getVariables[$name] = $value;
-					}
-					else
+					} else
 						$getVariables[$path] = '';
 				}
 			}
 			return $getVariables;
-		}
-		else
+		} else
 			return [];
 	}
 }

framework/Web/TUri.php

Braces +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
 			$this->_query = isset($ret['query'])?$ret['query']:'';
 			$this->_fragment = isset($ret['fragment'])?$ret['fragment']:'';
 			$this->_uri = $uri;
-		}
-		else
+		} else
 		{
 			throw new TInvalidDataValueException('uri_format_invalid', $uri);
 		}

framework/Web/THttpSession.php

Braces +4 added lines, -8 removed lines

@@ -318,13 +318,11 @@ 
 	  {
 				ini_set('session.use_cookies', '0');
 			  ini_set('session.use_only_cookies', '0');
-	  }
-			elseif($value === THttpSessionCookieMode::Allow)
+	  } elseif($value === THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies', '1');
 				ini_set('session.use_only_cookies', '0');
-			}
-			else
+			} else
 			{
 				ini_set('session.use_cookies', '1');
 				ini_set('session.use_only_cookies', '1');
@@ -377,8 +375,7 @@ 
 			{
 				ini_set('session.gc_probability', $value);
 				ini_set('session.gc_divisor', '100');
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 		}
 	}
@@ -570,8 +567,7 @@ 
 			$value = $_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 

framework/Web/THttpRequest.php

Braces +6 added lines, -12 removed lines

@@ -232,8 +232,7 @@ 
 				$port = $_SERVER['SERVER_PORT'];
 				if(($port != 80 && !$secure) || ($port != 443 && $secure))
 					$url .= ':' . $port;
-			}
-			else
+			} else
 				$url .= $_SERVER['HTTP_HOST'];
 			$url .= $this->getRequestUri();
 			$this->_url = new TUri($url);
@@ -341,8 +340,7 @@ 
 				{
 					$this->_urlManager = new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager = $this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager === null)
@@ -462,8 +460,7 @@ 
 
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = [];
 			foreach($_SERVER as $key => $value) {
 				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
@@ -575,8 +572,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -679,8 +675,7 @@ 
 					if(($value = $sm->validateData($value)) !== false)
 						$this->_cookies->add(new THttpCookie($key, $value));
 				}
-			}
-			else
+			} else
 			{
 				foreach($_COOKIE as $key => $value)
 					$this->_cookies->add(new THttpCookie($key, $value));
@@ -897,8 +892,7 @@ 
 			$value = $this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}