pradosoft / prado

framework/Web/UI/WebControls/TDataListItemRenderer.php

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
 			else
 				return false;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -211,8 +210,7 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/WebControls/TDataGrid.php

Braces +24 added lines, -48 removed lines

@@ -711,33 +711,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)
@@ -884,8 +878,7 @@ 
 			foreach($this->_autoColumns as $column)
 				$state[]=$column->saveState();
 			$this->setViewState('AutoColumns',$state,array());
-		}
-		else
+		} else
 			$this->clearViewState('AutoColumns');
 		if($this->_columns)
 		{
@@ -893,8 +886,7 @@ 
 			foreach($this->_columns as $column)
 				$state[]=$column->saveState();
 			$this->setViewState('Columns',$state,array());
-		}
-		else
+		} else
 			$this->clearViewState('Columns');
 	}
 
@@ -919,8 +911,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))
@@ -1026,8 +1017,7 @@ 
 			$columns=new TList($this->getColumns());
 			$autoColumns=$this->createAutoColumns($data);
 			$columns->mergeWith($autoColumns);
-		}
-		else
+		} else
 			$columns=$this->getColumns();
 		$this->_allColumns=$columns;
 
@@ -1117,8 +1107,7 @@ 
 					{
 						$prevCell=$cell;
 						$prevCellText=$cellText;
-					}
-					else
+					} else
 					{
 						if(($rowSpan=$prevCell->getRowSpan())===0)
 							$rowSpan=1;
@@ -1167,8 +1156,7 @@ 
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
-		}
-		else
+		} else
 		{
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -1251,8 +1239,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			$button=new TButton;
 			if(!$enabled)
@@ -1286,8 +1273,7 @@ 
 
 			$label=$this->createPagerButton($pager,$buttonType,false,$style->getPrevPageText(),'','');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text=$style->getFirstPageText())!=='')
 			{
@@ -1310,8 +1296,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);
@@ -1371,8 +1356,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);
@@ -1418,8 +1402,7 @@ 
 					$column->setDataField($key);
 					$column->setSortExpression($key);
 					$autoColumns->add($column);
-				}
-				else
+				} else
 				{
 					$column->setHeaderText(TListItemType::Item);
 					$column->setDataField($key);
@@ -1510,8 +1493,7 @@ 
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+					} else
 					{
 						if($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
@@ -1524,8 +1506,7 @@ 
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+					} else
 					{
 						if($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
@@ -1539,8 +1520,7 @@ 
 						{
 							if($pagerStyle->getPosition()===TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
 								$item->setVisible(false);
-						}
-						else
+						} else
 						{
 							if($pagerStyle->getPosition()===TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
 								$item->setVisible(false);
@@ -1612,8 +1592,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)
@@ -2039,8 +2018,7 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 }
@@ -2081,8 +2059,7 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -2178,8 +2155,7 @@ 
 		{
 			$item->setOwner($this->_o);
 			parent::insertAt($index,$item);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('datagridcolumncollection_datagridcolumn_required');
 	}
 }

framework/Web/UI/WebControls/TRepeatInfo.php

Braces +8 added lines, -16 removed lines

@@ -191,13 +191,11 @@ 
 				$control->setCaption($this->_caption);
 				$control->setCaptionAlign($this->_captionAlign);
 			}
-		}
-		else if($this->_repeatLayout===TRepeatLayout::Raw)
+		} else if($this->_repeatLayout===TRepeatLayout::Raw)
 		{
 			$this->renderRawContents($writer,$user);
 			return;
-		}
-		else
+		} else
 			$control=new TWebControl;
 		$control->setID($user->getClientID());
 		$control->copyBaseAttributes($user);
@@ -295,8 +293,7 @@ 
 				}
 			}
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$column=0;
 			for($i=0;$i<$itemCount;++$i)
@@ -334,8 +331,7 @@ 
 			$rows=$itemCount;
 			$columns=1;
 			$lastColumns=1;
-		}
-		else
+		} else
 		{
 			$columns=$this->_repeatColumns;
 			$rows=(int)(($itemCount+$columns-1)/$columns);
@@ -391,8 +387,7 @@ 
 						$user->renderItem($writer,$this,'Separator',$index);
 						$writer->renderEndTag();
 						$writer->writeLine();
-					}
-					else if($columns>1)
+					} else if($columns>1)
 						$writer->write("<td></td>\n");
 				}
 				if($row==$rows-1)
@@ -407,8 +402,7 @@ 
 				$writer->writeLine();
 			}
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$renderedItems=0;
 			for($row=0;$row<$rows;++$row)
@@ -473,8 +467,7 @@ 
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$user->renderItem($writer,$this,'Header',-1);
 			if($needBreak)
@@ -505,8 +498,7 @@ 
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
-		}
-		else
+		} else
 			$user->renderItem($writer,$this,'Footer',-1);
 		$writer->writeLine();
 	}

framework/Web/UI/WebControls/TDataTypeValidator.php

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 				{
 					$domain=substr($value,$pos+1);
 					return $domain===''?false:checkdnsrr($domain,'MX');
-				}
-				else
+				} else
 					return false;
 			}
 		}

framework/Web/UI/WebControls/TButton.php

Braces +2 added lines, -4 removed lines

@@ -106,8 +106,7 @@ 
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
-		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} else if($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
 		parent::addAttributesToRender($writer);
 	}
@@ -141,8 +140,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/WebControls/TWizard.php

Braces +14 added lines, -28 removed lines

@@ -816,8 +816,7 @@ 
 				$this->_navigation->renderControl($writer);
 				$writer->write("\n</td></tr></table>\n");
 				$this->renderEndTag($writer);
-			}
-			else
+			} else
 			{
 				$this->applyControlProperties();
 				$this->renderBeginTag($writer);
@@ -915,8 +914,7 @@ 
 				{
 					$container->setVisible(true);
 					$showStandard=false;
-				}
-				else
+				} else
 					$container->setVisible(false);
 			}
 		}
@@ -1041,11 +1039,9 @@ 
 					return TWizardStepType::Finish;
 				else
 					return TWizardStepType::Step;
-			}
-			else
+			} else
 				return $type;
-		}
-		else
+		} else
 			return $type;
 	}
 
@@ -1112,8 +1108,7 @@ 
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
 			}
-		}
-		else
+		} else
 		{
 			$this->_sideBar=new TPanel;
 			$this->getControls()->add($this->_sideBar);
@@ -1150,8 +1145,7 @@ 
 			{
 				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
 					$this->setActiveStepIndex($newStepIndex);
-			}
-			else
+			} else
 				$this->setActiveStepIndex($stepIndex);
 		}
 	}
@@ -1295,8 +1289,7 @@ 
 				$previousStepIndex=$history->pop();
 				if($activeStepIndex===$previousStepIndex && $history->getCount()>0)
 					$previousStepIndex=$history->pop();
-			}
-			else
+			} else
 			{
 				$previousStepIndex=$history->peek();
 				if($activeStepIndex===$previousStepIndex && $history->getCount()>1)
@@ -1307,8 +1300,7 @@ 
 				}
 			}
 			return $activeStepIndex===$previousStepIndex ? -1 : $previousStepIndex;
-		}
-		else
+		} else
 			return -1;
 	}
 
@@ -1372,8 +1364,7 @@ 
 					$navParam->setNextStepIndex($index+1);
 				$this->onNextButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_PREVIOUS)===0)
+			} else if(strcasecmp($command,self::CMD_PREVIOUS)===0)
 			{
 				if($type!==self::ST_FINISH && $type!==self::ST_STEP)
 					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_PREVIOUS);
@@ -1382,8 +1373,7 @@ 
 					$navParam->setNextStepIndex($prevIndex);
 				$this->onPreviousButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_COMPLETE)===0)
+			} else if(strcasecmp($command,self::CMD_COMPLETE)===0)
 			{
 				if($type!==self::ST_FINISH)
 					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_COMPLETE);
@@ -1391,8 +1381,7 @@ 
 					$navParam->setNextStepIndex($index+1);
 				$this->onCompleteButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_MOVETO)===0)
+			} else if(strcasecmp($command,self::CMD_MOVETO)===0)
 			{
 				if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
 					$navParam->setCancelNavigation(true);
@@ -1408,8 +1397,7 @@ 
 						}
 					if ($requestedIndex<0)
 						throw new TConfigurationException('wizard_step_invalid');
-				}
-				else
+				} else
 					$requestedIndex=TPropertyValue::ensureInteger($requestedStep);
 				$navParam->setNextStepIndex($requestedIndex);
 				$handled=true;
@@ -1426,8 +1414,7 @@ 
 							$this->getPreviousStepIndex(true);  // pop out the previous move from history
 						$this->setActiveStepIndex($nextStepIndex);
 					}
-				}
-				else
+				} else
 					$this->setActiveStepIndex($index);
 				return true;
 			}
@@ -1705,8 +1692,7 @@ 
 			parent::insertAt($index,$item);
 			$this->_wizard->getMultiView()->getViews()->insertAt($index,$item);
 			$this->_wizard->addedWizardStep($item);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('wizardstepcollection_wizardstep_required');
 	}
 

framework/Web/UI/WebControls/TListBox.php

Braces +4 added lines, -8 removed lines

@@ -101,8 +101,7 @@ 
 				{
 					$this->setSelectedIndex($index);
 					return $this->_dataChanged=true;
-				}
-				else
+				} else
 					return false;
 			}
 			if(!is_array($selections))
@@ -124,8 +123,7 @@ 
 						break;
 					}
 				}
-			}
-			else
+			} else
 				$flag=true;
 			if($flag)
 			{
@@ -133,13 +131,11 @@ 
 				$this->_dataChanged=true;
 			}
 			return $flag;
-		}
-		else if($this->getSelectedIndex()!==-1)
+		} else if($this->getSelectedIndex()!==-1)
 		{
 			$this->clearSelection();
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/WebControls/TSlider.php

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
 			else
 				return false;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -211,8 +210,7 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/WebControls/TDatePicker.php

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
 			else
 				return false;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -211,8 +210,7 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}