pradosoft / prado

framework/Web/UI/ActiveControls/TActivePageAdapter.php

Braces +2 added lines, -4 removed lines

@@ -256,14 +256,12 @@
 				$param = $this->getCallbackEventParameter();
 				$result = new TCallbackEventParameter($this->getResponse(), $param);
 				$callbackHandler->raiseCallbackEvent($result);
-			}
-			else
+			} else
 			{
 				throw new TInvalidCallbackException(
 					'callback_invalid_handler', $callbackHandler->getUniqueID());
 			}
-		 }
-		 else
+		 } else
 		 {
 		 	$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
 		 	throw new TInvalidCallbackException('callback_invalid_target', $target);

framework/Web/UI/ActiveControls/TActiveDataGrid.php

Braces +2 added lines, -4 removed lines

@@ -140,8 +140,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else {
+		} else {
 			$button=new TActiveButton;
 			if(!$enabled)
 				$button->setEnabled(false);
@@ -175,8 +174,7 @@ 
 		if($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}
 	}

framework/Web/UI/ActiveControls/TActiveButtonColumn.php

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
 				$button->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 			$cell->getControls()->add($button);
 			$cell->registerObject('Button',$button);
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TBaseActiveCallbackControl.php

Braces +2 added lines, -4 removed lines

@@ -233,8 +233,7 @@ 
 				$newid=substr($id,$pos+1);
 				if ($control!==null)
 					$control=$control->$newid;
-			}
-			else
+			} else
 			{
 				// TCheckBoxList overrides findControl() with a fake implementation
 				// but accepts a second parameter to use the standard one
@@ -296,8 +295,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/WebControls/TRepeaterItem.php

Braces +1 added lines, -2 removed lines

@@ -129,8 +129,7 @@
 		{
 			$this->raiseBubbleEvent($this,new TRepeaterCommandEventParameter($this,$sender,$param));
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TDataGrid.php

Braces +21 added lines, -42 removed lines

@@ -708,33 +708,27 @@ 
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			} else if(strcasecmp($command,self::CMD_EDIT)===0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			} else if(strcasecmp($command,self::CMD_DELETE)===0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			} else if(strcasecmp($command,self::CMD_UPDATE)===0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			} else if(strcasecmp($command,self::CMD_CANCEL)===0)
 			{
 				$this->onCancelCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_SORT)===0)
+			} else if(strcasecmp($command,self::CMD_SORT)===0)
 			{
 				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender,$param));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE)===0)
 			{
 				$p=$param->getCommandParameter();
 				if(strcasecmp($p,self::CMD_PAGE_NEXT)===0)
@@ -881,8 +875,7 @@ 
 			foreach($this->_autoColumns as $column)
 				$state[]=$column->saveState();
 			$this->setViewState('AutoColumns',$state,array());
-		}
-		else
+		} else
 			$this->clearViewState('AutoColumns');
 		if($this->_columns)
 		{
@@ -890,8 +883,7 @@ 
 			foreach($this->_columns as $column)
 				$state[]=$column->saveState();
 			$this->setViewState('Columns',$state,array());
-		}
-		else
+		} else
 			$this->clearViewState('Columns');
 	}
 
@@ -916,8 +908,7 @@ 
 					$column->loadState($st);
 					$this->_autoColumns->add($column);
 				}
-			}
-			else
+			} else
 				$this->_autoColumns=null;
 			$state=$this->getViewState('Columns',array());
 			if($this->_columns && $this->_columns->getCount()===count($state))
@@ -1023,8 +1014,7 @@ 
 			$columns=new TList($this->getColumns());
 			$autoColumns=$this->createAutoColumns($data);
 			$columns->mergeWith($autoColumns);
-		}
-		else
+		} else
 			$columns=$this->getColumns();
 		$this->_allColumns=$columns;
 
@@ -1114,8 +1104,7 @@ 
 					{
 						$prevCell=$cell;
 						$prevCellText=$cellText;
-					}
-					else
+					} else
 					{
 						if(($rowSpan=$prevCell->getRowSpan())===0)
 							$rowSpan=1;
@@ -1164,8 +1153,7 @@ 
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
-		}
-		else
+		} else
 		{
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -1248,8 +1236,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			$button=new TButton;
 			if(!$enabled)
@@ -1283,8 +1270,7 @@ 
 
 			$label=$this->createPagerButton($pager,$buttonType,false,$style->getPrevPageText(),'','');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text=$style->getFirstPageText())!=='')
 			{
@@ -1307,8 +1293,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);
@@ -1368,8 +1353,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);
@@ -1415,8 +1399,7 @@ 
 					$column->setDataField($key);
 					$column->setSortExpression($key);
 					$autoColumns->add($column);
-				}
-				else
+				} else
 				{
 					$column->setHeaderText(TListItemType::Item);
 					$column->setDataField($key);
@@ -1507,8 +1490,7 @@ 
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+					} else
 					{
 						if($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
@@ -1521,8 +1503,7 @@ 
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+					} else
 					{
 						if($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
@@ -1536,8 +1517,7 @@ 
 						{
 							if($pagerStyle->getPosition()===TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
 								$item->setVisible(false);
-						}
-						else
+						} else
 						{
 							if($pagerStyle->getPosition()===TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
 								$item->setVisible(false);
@@ -1609,8 +1589,7 @@ 
 				$control->renderBeginTag($writer);
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
-			}
-			else if($this->getViewState('ItemCount',0)>0)
+			} else if($this->getViewState('ItemCount',0)>0)
 			{
 				$this->applyItemStyles();
 				if($this->_topPager)

framework/Web/UI/WebControls/TDataBoundControl.php

Braces +6 added lines, -12 removed lines

@@ -286,8 +286,7 @@ 
 		{
 			$this->_requiresDataBinding=true;
 			$this->ensureDataBound();
-		}
-		else
+		} else
 			$this->_requiresDataBinding=$value;
 	}
 
@@ -350,8 +349,7 @@ 
 					$this->setCurrentPageIndex($ds->getCurrentPageIndex());
 				}
 				$this->performDataBinding($ds);
-			}
-			else
+			} else
 			{
 				$this->clearViewState('PageCount');
 				$this->performDataBinding($data);
@@ -380,8 +378,7 @@ 
 				if($this->_currentViewIsFromDataSourceID=$this->getUsingDataSourceID())
 					$view->attachEventHandler('OnDataSourceViewChanged',array($this,'dataSourceViewChanged'));
 				$this->_currentView=$view;
-			}
-			else
+			} else
 				$this->_currentView=null;
 			$this->_currentViewValid=true;
 		}
@@ -400,8 +397,7 @@ 
 					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid',$dsid);
 				else
 					$this->_currentDataSource=$dataSource;
-			}
-			else if(($dataSource=$this->getDataSource())!==null)
+			} else if(($dataSource=$this->getDataSource())!==null)
 				$this->_currentDataSource=new TReadOnlyDataSource($dataSource,$this->getDataMember());
 			else
 				$this->_currentDataSource=null;
@@ -482,14 +478,12 @@ 
 					$list->add(array($value,is_string($key)?$key:$value));
 			}
 			return $list;
-		}
-		else if(is_array($value))
+		} else if(is_array($value))
 			return new TMap($value);
 		else if($value instanceof TDbDataReader) {
 			// read array from TDbDataReader since it's forward-only stream and can only be traversed once
 			return $value->readAll();
-		}
-		else if(($value instanceof \Traversable) || $value===null)
+		} else if(($value instanceof \Traversable) || $value===null)
 			return $value;
 		else
 			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid',get_class($this));

framework/Web/UI/WebControls/TPager.php

Braces +11 added lines, -22 removed lines

@@ -403,8 +403,7 @@ 
 			$this->setPageCount($targetControl->getPageCount());
 			$this->setCurrentPageIndex($targetControl->getCurrentPageIndex());
 			$this->buildPager();
-		}
-		else
+		} else
 			$this->_pageCount=0;
 	}
 
@@ -466,15 +465,13 @@ 
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			if($buttonType===TPagerButtonType::ImageButton)
 			{
 				$button=new TImageButton;
 				$button->setImageUrl($this->getPageImageUrl($text,$commandName));
-			}
-			else
+			} else
 				$button=new TButton;
 			if(!$enabled)
 				$button->setEnabled(false);
@@ -529,8 +526,7 @@ 
 			}
 			$label=$this->createPagerButton($buttonType,false,$this->getPrevPageText(),self::CMD_PAGE_PREV,'');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text=$this->getFirstPageText())!=='')
 			{
@@ -552,8 +548,7 @@ 
 				$label=$this->createPagerButton($buttonType,false,$text,self::CMD_PAGE_LAST,'');
 				$controls->add($label);
 			}
-		}
-		else
+		} else
 		{
 			$button=$this->createPagerButton($buttonType,true,$this->getNextPageText(),self::CMD_PAGE_NEXT,'');
 			$controls->add($button);
@@ -611,8 +606,7 @@ 
 			{
 				$label=$this->createPagerButton($buttonType,false,"$i",self::CMD_PAGE,'');
 				$controls->add($label);
-			}
-			else
+			} else
 			{
 				$button=$this->createPagerButton($buttonType,true,"$i",self::CMD_PAGE,"$i");
 				$controls->add($button);
@@ -689,32 +683,27 @@ 
 				$pageIndex=TPropertyValue::ensureInteger($param->getCommandParameter())-1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_NEXT)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_NEXT)===0)
 			{
 				$pageIndex=$this->getCurrentPageIndex()+1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_PREV)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_PREV)===0)
 			{
 				$pageIndex=$this->getCurrentPageIndex()-1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_FIRST)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_FIRST)===0)
 			{
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,0));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_LAST)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_LAST)===0)
 			{
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$this->getPageCount()-1));
 				return true;
 			}
 			return false;
-		}
-		else
+		} else
 			return false;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TOutputCache.php

Braces +6 added lines, -12 removed lines

@@ -116,8 +116,7 @@ 
 					$this->_cache=$this->getApplication()->getModule($this->_cacheModuleID);
 					if(!($this->_cache instanceof ICache))
 						throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
-				}
-				else
+				} else
 					$this->_cache=$this->getApplication()->getCache();
 				if($this->_cache!==null)
 				{
@@ -129,8 +128,7 @@ 
 						$param->setCacheTime(isset($data[3])?$data[3]:0);
 						$this->onCheckDependency($param);
 						$this->_dataCached=$param->getIsValid();
-					}
-					else
+					} else
 						$this->_dataCached=false;
 					if($this->_dataCached)
 						list($this->_contents,$this->_state,$this->_actions,$this->_cacheTime)=$data;
@@ -154,8 +152,7 @@ 
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
-		}
-		else
+		} else
 			parent::initRecursive($namingContainer);
 	}
 
@@ -175,8 +172,7 @@ 
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 		{
 			if($this->_dataCached)
 				$this->performActions();
@@ -214,8 +210,7 @@ 
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 			parent::preRenderRecursive();
 	}
 
@@ -496,8 +491,7 @@ 
 			$content=$textwriter->flush();
 			$data=array($content,$this->_state,$this->_actions,time());
 			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 }
\ No newline at end of file