pradosoft / prado

framework/Web/UI/TControlCollection.php

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
 		{
 			parent::insertAt($index,$item);
 			$this->_o->addedControl($item);
-		}
-		else if(is_string($item) || ($item instanceof IRenderable))
+		} else if(is_string($item) || ($item instanceof IRenderable))
 			parent::insertAt($index,$item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');

framework/Web/UI/TControl.php

Braces +14 added lines, -24 removed lines

@@ -405,11 +405,9 @@ 
 					return $this->_id;
 				else
 					return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
-			}
-			else	// no naming container
+			} else	// no naming container
 				return $this->_id;
-		}
-		else
+		} else
 			return $this->_uid;
 	}
 
@@ -563,8 +561,7 @@ 
 				if(!$control->getVisible(false))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Visible',true);
 	}
 
@@ -594,8 +591,7 @@ 
 				if(!$control->getViewState('Enabled',true))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Enabled',true);
 	}
 
@@ -692,8 +688,7 @@ 
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
-		}
-		else
+		} else
 			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 
@@ -778,8 +773,7 @@ 
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
 				$this->_viewState[$key]=$this->_tempState[$key];
 			return $this->_tempState[$key];
-		}
-		else
+		} else
 			return $defaultValue;
 	}
 
@@ -799,8 +793,7 @@ 
 		{
 			unset($this->_tempState[$key]);
 			$this->_viewState[$key]=$value;
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
 			if($value===$defaultValue)
@@ -949,8 +942,7 @@ 
 					$this->createChildControls();
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -1189,8 +1181,9 @@ 
 	final protected function isDescendentOf($ancestor)
 	{
 		$control=$this;
-		while($control!==$ancestor && $control->_parent)
-			$control=$control->_parent;
+		while($control!==$ancestor && $control->_parent) {
+					$control=$control->_parent;
+		}
 		return $control===$ancestor;
 	}
 
@@ -1226,8 +1219,7 @@ 
 				{
 					$state=$this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
-				}
-				else
+				} else
 					$state=null;
 				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
 				if($this->_stage>=self::CS_LOADED)
@@ -1632,8 +1624,7 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
 				unset($state[1]);
-			}
-			else
+			} else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
@@ -1710,8 +1701,7 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
-		}
-		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
+		} else if($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 	}
 

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));