pradosoft / prado

framework/Web/UI/WebControls/TReCaptchaValidator.php

Spacing +18 added lines, -18 removed lines

@@ -30,7 +30,7 @@ 
  */
 class TReCaptchaValidator extends TBaseValidator
 {
-	protected $_isvalid = null;
+	protected $_isvalid=null;
 
 	/**
 	 * Gets the name of the javascript class responsible for performing validation for this control.
@@ -49,18 +49,18 @@ 
 
 	protected function getCaptchaControl()
 	{
-		$control = $this->getValidationTarget();
-		if (!$control)
+		$control=$this->getValidationTarget();
+		if(!$control)
 			throw new Exception('No target control specified for TReCaptchaValidator');
-		if (!($control instanceof TReCaptcha))
+		if(!($control instanceof TReCaptcha))
 			throw new Exception('TReCaptchaValidator only works with TReCaptcha controls');
 		return $control;
 	}
 
 	public function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
-		$options['ResponseFieldName'] = $this->getCaptchaControl()->getResponseFieldName();
+		$options=parent::getClientScriptOptions();
+		$options['ResponseFieldName']=$this->getCaptchaControl()->getResponseFieldName();
 		return $options;
 	}
 
@@ -74,10 +74,10 @@ 
 	protected function evaluateIsValid()
 	{
 		// check validity only once (if trying to evaulate multiple times, all redundant checks would fail)
-		if (is_null($this->_isvalid))
+		if(is_null($this->_isvalid))
 		{
-			$control = $this->getCaptchaControl();
-			$this->_isvalid = $control->validate();
+			$control=$this->getCaptchaControl();
+			$this->_isvalid=$control->validate();
 		}
 		return ($this->_isvalid==true);
 	}
@@ -86,23 +86,23 @@ 
 	{
 		parent::onPreRender($param);
 
-		$cs = $this->Page->getClientScript();
+		$cs=$this->Page->getClientScript();
 		$cs->registerPradoScript('validator');
 
 		// communicate validation status to the client side
-		$value = $this->_isvalid===false ? '0' : '1';
-		$cs->registerHiddenField($this->getClientID().'_1',$value);
+		$value=$this->_isvalid===false ? '0' : '1';
+		$cs->registerHiddenField($this->getClientID().'_1', $value);
 		
 		// update validator display
-		if ($control = $this->getValidationTarget())
+		if($control=$this->getValidationTarget())
 		{
-			$fn = 'captchaUpdateValidatorStatus_'.$this->getClientID();
+			$fn='captchaUpdateValidatorStatus_'.$this->getClientID();
 
 			// check if we need to request a new captcha too
-			if ($this->Page->IsCallback)
+			if($this->Page->IsCallback)
 			{
-				if ($control->getVisible(true))
-					if (!is_null($this->_isvalid))
+				if($control->getVisible(true))
+					if(!is_null($this->_isvalid))
 					{
 						// if the response has been tested and we reach the pre-render phase 
 						// then we need to regenerate the token, because it won't test positive
@@ -112,7 +112,7 @@ 
 					}
 			}
 
-			$cs->registerEndScript($this->getClientID().'::validate', implode(' ',array(
+			$cs->registerEndScript($this->getClientID().'::validate', implode(' ', array(
 				// this function will be used to update the validator
 				'function '.$fn.'(valid)',
 				'{',

framework/Web/UI/WebControls/TBaseDataList.php

Spacing +7 added lines, -7 removed lines

@@ -134,7 +134,7 @@ 
 	 */
 	public function getDataKeyField()
 	{
-		return $this->getViewState('DataKeyField','');
+		return $this->getViewState('DataKeyField', '');
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	public function setDataKeyField($value)
 	{
-		$this->setViewState('DataKeyField',$value,'');
+		$this->setViewState('DataKeyField', $value, '');
 	}
 
 	/**
@@ -150,10 +150,10 @@ 
 	 */
 	public function getDataKeys()
 	{
-		if(($dataKeys=$this->getViewState('DataKeys',null))===null)
+		if(($dataKeys=$this->getViewState('DataKeys', null))===null)
 		{
 			$dataKeys=new TList;
-			$this->setViewState('DataKeys',$dataKeys,null);
+			$this->setViewState('DataKeys', $dataKeys, null);
 		}
 		return $dataKeys;
 	}
@@ -169,9 +169,9 @@ 
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data is invalid
 	 */
-	protected function getDataFieldValue($data,$field)
+	protected function getDataFieldValue($data, $field)
 	{
-		return TDataFieldAccessor::getDataFieldValue($data,$field);
+		return TDataFieldAccessor::getDataFieldValue($data, $field);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 */
 	public function onSelectedIndexChanged($param)
 	{
-		$this->raiseEvent('OnSelectedIndexChanged',$this,$param);
+		$this->raiseEvent('OnSelectedIndexChanged', $this, $param);
 	}
 }
 

framework/Web/UI/WebControls/TLinkButton.php

Spacing +27 added lines, -27 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		// We call parent implementation here because some attributes
 		// may be overwritten in the following
@@ -100,7 +100,7 @@ 
 			$this->renderClientControlScript($writer);
 		}
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 	}
 
 	/**
@@ -109,8 +109,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	protected function renderLinkButtonHref($writer)
 	{
 		//create unique no-op url references
-		$nop = "javascript:;//".$this->getClientID();
+		$nop="javascript:;//".$this->getClientID();
 		$writer->addAttribute('href', $nop);
 	}
 
@@ -157,11 +157,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['StopEvent'] = true;
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['StopEvent']=true;
 
 		return $options;
 	}
@@ -185,7 +185,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -193,7 +193,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -276,7 +276,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -284,7 +284,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -301,7 +301,7 @@ 
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onClick(null);
-		$this->onCommand(new TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onCommand(new TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -313,7 +313,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -325,8 +325,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 }
 

framework/Web/UI/WebControls/TJavascriptLogger.php

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
  */
 class TJavascriptLogger extends TWebControl
 {
-	private static $_keyCodes = array(
+	private static $_keyCodes=array(
 		'0'=>48, '1'=>49, '2'=>50, '3'=>51, '4'=>52, '5'=>53, '6'=>54, '7'=>55, '8'=>56, '9'=>57,
 		'a'=>65, 'b'=>66, 'c'=>67, 'd'=>68, 'e'=>69, 'f'=>70, 'g'=>71, 'h'=>72,
 		'i'=>73, 'j'=>74, 'k'=>75, 'l'=>76, 'm'=>77, 'n'=>78, 'o'=>79, 'p'=>80,
@@ -66,11 +66,11 @@ 
 	 */
 	public function onPreRender($param)
 	{
-		$key = strtolower($this->getToggleKey());
-		$code = isset(self::$_keyCodes[$key]) ? self::$_keyCodes[$key] : 74;
-		$js = "var logConsole; jQuery(function() { logConsole = new LogConsole($code)}); ";
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerBeginScript($this->getClientID(),$js);
+		$key=strtolower($this->getToggleKey());
+		$code=isset(self::$_keyCodes[$key]) ? self::$_keyCodes[$key] : 74;
+		$js="var logConsole; jQuery(function() { logConsole = new LogConsole($code)}); ";
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerBeginScript($this->getClientID(), $js);
 		$cs->registerPradoScript('logger');
 	}
 
@@ -81,10 +81,10 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		$code = strtoupper($this->getToggleKey());
-		$info = '(<a href="http://web.archive.org/web/20060512041505/gleepglop.com/javascripts/logger/" target="_blank">more info</a>).';
-		$link = '<a href="javascript:if(logConsole)logConsole.toggle()">toggle the javascript log console.</a>';
-		$usage = 'Press ALT-'.$code.' (Or CTRL-'.$code.' on OS X) to';
+		$code=strtoupper($this->getToggleKey());
+		$info='(<a href="http://web.archive.org/web/20060512041505/gleepglop.com/javascripts/logger/" target="_blank">more info</a>).';
+		$link='<a href="javascript:if(logConsole)logConsole.toggle()">toggle the javascript log console.</a>';
+		$usage='Press ALT-'.$code.' (Or CTRL-'.$code.' on OS X) to';
 		$writer->write("{$usage} {$link} {$info}");
 	}
 }

framework/Web/UI/WebControls/TCheckBoxColumn.php

Spacing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	public function getDataField()
 	{
-		return $this->getViewState('DataField','');
+		return $this->getViewState('DataField', '');
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 */
 	public function setDataField($value)
 	{
-		$this->setViewState('DataField',$value,'');
+		$this->setViewState('DataField', $value, '');
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem)
 		{
@@ -93,12 +93,12 @@ 
 				$checkBox->setEnabled(false);
 			$cell->setHorizontalAlign('Center');
 			$cell->getControls()->add($checkBox);
-			$cell->registerObject('CheckBox',$checkBox);
+			$cell->registerObject('CheckBox', $checkBox);
 			if($this->getDataField()!=='')
-				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$checkBox->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -106,12 +106,12 @@ 
 	 * This method is invoked when datagrid performs databinding.
 	 * It populates the content of the cell with the relevant data from data source.
 	 */
-	public function dataBindColumn($sender,$param)
+	public function dataBindColumn($sender, $param)
 	{
 		$item=$sender->getNamingContainer();
 		$data=$item->getData();
 		if(($field=$this->getDataField())!=='')
-			$value=TPropertyValue::ensureBoolean($this->getDataFieldValue($data,$field));
+			$value=TPropertyValue::ensureBoolean($this->getDataFieldValue($data, $field));
 		else
 			$value=TPropertyValue::ensureBoolean($data);
 		if($sender instanceof TCheckBox)

framework/Web/UI/WebControls/TWizard.php

Spacing +103 added lines, -103 removed lines

@@ -210,7 +210,7 @@ 
 	 */
 	public function setActiveStep($step)
 	{
-		if(($index=$this->getWizardSteps()->indexOf($step))<0)
+		if(($index=$this->getWizardSteps()->indexOf($step)) < 0)
 			throw new TInvalidOperationException('wizard_step_invalid');
 		$this->setActiveStepIndex($index);
 	}
@@ -257,7 +257,7 @@ 
 	 */
 	public function getShowCancelButton()
 	{
-		return $this->getViewState('ShowCancelButton',false);
+		return $this->getViewState('ShowCancelButton', false);
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 */
 	public function setShowCancelButton($value)
 	{
-		$this->setViewState('ShowCancelButton',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ShowCancelButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 */
 	public function getShowSideBar()
 	{
-		return $this->getViewState('ShowSideBar',true);
+		return $this->getViewState('ShowSideBar', true);
 	}
 
 	/**
@@ -281,7 +281,7 @@ 
 	 */
 	public function setShowSideBar($value)
 	{
-		$this->setViewState('ShowSideBar',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowSideBar', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 	 */
 	public function getHeaderText()
 	{
-		return $this->getViewState('HeaderText','');
+		return $this->getViewState('HeaderText', '');
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	 */
 	public function setHeaderText($value)
 	{
-		$this->setViewState('HeaderText',TPropertyValue::ensureString($value),'');
+		$this->setViewState('HeaderText', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -391,7 +391,7 @@ 
 	 */
 	public function getCancelDestinationUrl()
 	{
-		return $this->getViewState('CancelDestinationUrl','');
+		return $this->getViewState('CancelDestinationUrl', '');
 	}
 
 	/**
@@ -400,7 +400,7 @@ 
 	 */
 	public function setCancelDestinationUrl($value)
 	{
-		$this->setViewState('CancelDestinationUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('CancelDestinationUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -409,7 +409,7 @@ 
 	 */
 	public function getFinishDestinationUrl()
 	{
-		return $this->getViewState('FinishDestinationUrl','');
+		return $this->getViewState('FinishDestinationUrl', '');
 	}
 
 	/**
@@ -417,7 +417,7 @@ 
 	 */
 	public function setFinishDestinationUrl($value)
 	{
-		$this->setViewState('FinishDestinationUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('FinishDestinationUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -425,10 +425,10 @@ 
 	 */
 	public function getSideBarButtonStyle()
 	{
-		if(($style=$this->getViewState('SideBarButtonStyle',null))===null)
+		if(($style=$this->getViewState('SideBarButtonStyle', null))===null)
 		{
 			$style=new TStyle;
-			$this->setViewState('SideBarButtonStyle',$style,null);
+			$this->setViewState('SideBarButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -438,10 +438,10 @@ 
 	 */
 	public function getNavigationButtonStyle()
 	{
-		if(($style=$this->getViewState('NavigationButtonStyle',null))===null)
+		if(($style=$this->getViewState('NavigationButtonStyle', null))===null)
 		{
 			$style=new TStyle;
-			$this->setViewState('NavigationButtonStyle',$style,null);
+			$this->setViewState('NavigationButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -451,11 +451,11 @@ 
 	 */
 	public function getStartNextButtonStyle()
 	{
-		if(($style=$this->getViewState('StartNextButtonStyle',null))===null)
+		if(($style=$this->getViewState('StartNextButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Next');
-			$this->setViewState('StartNextButtonStyle',$style,null);
+			$this->setViewState('StartNextButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -465,11 +465,11 @@ 
 	 */
 	public function getStepNextButtonStyle()
 	{
-		if(($style=$this->getViewState('StepNextButtonStyle',null))===null)
+		if(($style=$this->getViewState('StepNextButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Next');
-			$this->setViewState('StepNextButtonStyle',$style,null);
+			$this->setViewState('StepNextButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -479,11 +479,11 @@ 
 	 */
 	public function getStepPreviousButtonStyle()
 	{
-		if(($style=$this->getViewState('StepPreviousButtonStyle',null))===null)
+		if(($style=$this->getViewState('StepPreviousButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Previous');
-			$this->setViewState('StepPreviousButtonStyle',$style,null);
+			$this->setViewState('StepPreviousButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -493,11 +493,11 @@ 
 	 */
 	public function getFinishCompleteButtonStyle()
 	{
-		if(($style=$this->getViewState('FinishCompleteButtonStyle',null))===null)
+		if(($style=$this->getViewState('FinishCompleteButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Complete');
-			$this->setViewState('FinishCompleteButtonStyle',$style,null);
+			$this->setViewState('FinishCompleteButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -507,11 +507,11 @@ 
 	 */
 	public function getFinishPreviousButtonStyle()
 	{
-		if(($style=$this->getViewState('FinishPreviousButtonStyle',null))===null)
+		if(($style=$this->getViewState('FinishPreviousButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Previous');
-			$this->setViewState('FinishPreviousButtonStyle',$style,null);
+			$this->setViewState('FinishPreviousButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -521,11 +521,11 @@ 
 	 */
 	public function getCancelButtonStyle()
 	{
-		if(($style=$this->getViewState('CancelButtonStyle',null))===null)
+		if(($style=$this->getViewState('CancelButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Cancel');
-			$this->setViewState('CancelButtonStyle',$style,null);
+			$this->setViewState('CancelButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -535,10 +535,10 @@ 
 	 */
 	public function getSideBarStyle()
 	{
-		if(($style=$this->getViewState('SideBarStyle',null))===null)
+		if(($style=$this->getViewState('SideBarStyle', null))===null)
 		{
 			$style=new TPanelStyle;
-			$this->setViewState('SideBarStyle',$style,null);
+			$this->setViewState('SideBarStyle', $style, null);
 		}
 		return $style;
 	}
@@ -548,10 +548,10 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null)
+		if(($style=$this->getViewState('HeaderStyle', null))===null)
 		{
 			$style=new TPanelStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -561,10 +561,10 @@ 
 	 */
 	public function getStepStyle()
 	{
-		if(($style=$this->getViewState('StepStyle',null))===null)
+		if(($style=$this->getViewState('StepStyle', null))===null)
 		{
 			$style=new TPanelStyle;
-			$this->setViewState('StepStyle',$style,null);
+			$this->setViewState('StepStyle', $style, null);
 		}
 		return $style;
 	}
@@ -574,10 +574,10 @@ 
 	 */
 	public function getNavigationStyle()
 	{
-		if(($style=$this->getViewState('NavigationStyle',null))===null)
+		if(($style=$this->getViewState('NavigationStyle', null))===null)
 		{
 			$style=new TPanelStyle;
-			$this->setViewState('NavigationStyle',$style,null);
+			$this->setViewState('NavigationStyle', $style, null);
 		}
 		return $style;
 	}
@@ -587,7 +587,7 @@ 
 	 */
 	public function getUseDefaultLayout()
 	{
-		return $this->getViewState('UseDefaultLayout',true);
+		return $this->getViewState('UseDefaultLayout', true);
 	}
 
 	/**
@@ -597,7 +597,7 @@ 
 	 */
 	public function setUseDefaultLayout($value)
 	{
-		$this->setViewState('UseDefaultLayout',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('UseDefaultLayout', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -656,7 +656,7 @@ 
 	 */
 	public function onActiveStepChanged($param)
 	{
-		$this->raiseEvent('OnActiveStepChanged',$this,$param);
+		$this->raiseEvent('OnActiveStepChanged', $this, $param);
 	}
 
 	/**
@@ -667,7 +667,7 @@ 
 	 */
 	public function onCancelButtonClick($param)
 	{
-		$this->raiseEvent('OnCancelButtonClick',$this,$param);
+		$this->raiseEvent('OnCancelButtonClick', $this, $param);
 		if(($url=$this->getCancelDestinationUrl())!=='')
 			$this->getResponse()->redirect($url);
 	}
@@ -680,7 +680,7 @@ 
 	 */
 	public function onCompleteButtonClick($param)
 	{
-		$this->raiseEvent('OnCompleteButtonClick',$this,$param);
+		$this->raiseEvent('OnCompleteButtonClick', $this, $param);
 		if(($url=$this->getFinishDestinationUrl())!=='')
 			$this->getResponse()->redirect($url);
 	}
@@ -693,7 +693,7 @@ 
 	 */
 	public function onNextButtonClick($param)
 	{
-		$this->raiseEvent('OnNextButtonClick',$this,$param);
+		$this->raiseEvent('OnNextButtonClick', $this, $param);
 	}
 
 	/**
@@ -704,7 +704,7 @@ 
 	 */
 	public function onPreviousButtonClick($param)
 	{
-		$this->raiseEvent('OnPreviousButtonClick',$this,$param);
+		$this->raiseEvent('OnPreviousButtonClick', $this, $param);
 	}
 
 	/**
@@ -714,7 +714,7 @@ 
 	 */
 	public function onSideBarButtonClick($param)
 	{
-		$this->raiseEvent('OnSideBarButtonClick',$this,$param);
+		$this->raiseEvent('OnSideBarButtonClick', $this, $param);
 	}
 
 	/**
@@ -728,7 +728,7 @@ 
 		{
 			$this->_multiView=new TMultiView;
 			$this->_multiView->setID('WizardMultiView');
-			$this->_multiView->attachEventHandler('OnActiveViewChanged',array($this,'onActiveStepChanged'));
+			$this->_multiView->attachEventHandler('OnActiveViewChanged', array($this, 'onActiveStepChanged'));
 			$this->_multiView->ignoreBubbleEvents();
 		}
 		return $this->_multiView;
@@ -770,7 +770,7 @@ 
 		parent::onInit($param);
 		$this->ensureChildControls();
 		$this->setEnsureId(true);
-		if($this->getActiveStepIndex()<0 && $this->getWizardSteps()->getCount()>0)
+		if($this->getActiveStepIndex() < 0 && $this->getWizardSteps()->getCount() > 0)
 			$this->setActiveStepIndex(0);
 	}
 
@@ -846,7 +846,7 @@ 
 	 */
 	protected function applyHeaderProperties()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))!==null)
+		if(($style=$this->getViewState('HeaderStyle', null))!==null)
 			$this->_header->getStyle()->mergeWith($style);
 		if($this->getHeaderTemplate()===null)
 		{
@@ -866,7 +866,7 @@ 
 			$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 			$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 			$this->_sideBarDataList->dataBind();
-			if(($style=$this->getViewState('SideBarButtonStyle',null))!==null)
+			if(($style=$this->getViewState('SideBarButtonStyle', null))!==null)
 			{
 				foreach($this->_sideBarDataList->getItems() as $item)
 				{
@@ -875,7 +875,7 @@ 
 				}
 			}
 		}
-		if(($style=$this->getViewState('SideBarStyle',null))!==null)
+		if(($style=$this->getViewState('SideBarStyle', null))!==null)
 			$this->_sideBar->getStyle()->mergeWith($style);
 	}
 
@@ -884,7 +884,7 @@ 
 	 */
 	protected function applyStepContentProperties()
 	{
-		if(($style=$this->getViewState('StepStyle',null))!==null)
+		if(($style=$this->getViewState('StepStyle', null))!==null)
 			$this->_stepContent->getStyle()->mergeWith($style);
 	}
 
@@ -899,7 +899,7 @@ 
 
 		if(!$this->_navigation)
 			return;
-		else if($activeStepIndex<0 || $activeStepIndex>=$wizardSteps->getCount())
+		else if($activeStepIndex < 0 || $activeStepIndex >= $wizardSteps->getCount())
 		{
 			$this->_navigation->setVisible(false);
 			return;
@@ -930,12 +930,12 @@ 
 		$this->_stepNavigation->setVisible($showStandard && $activeStepType===self::ST_STEP);
 		$this->_finishNavigation->setVisible($showStandard && $activeStepType===self::ST_FINISH);
 
-		if(($navigationStyle=$this->getViewState('NavigationStyle',null))!==null)
+		if(($navigationStyle=$this->getViewState('NavigationStyle', null))!==null)
 			$this->_navigation->getStyle()->mergeWith($navigationStyle);
 
 		$displayCancelButton=$this->getShowCancelButton();
 		$cancelButtonStyle=$this->getCancelButtonStyle();
-		$buttonStyle=$this->getViewState('NavigationButtonStyle',null);
+		$buttonStyle=$this->getViewState('NavigationButtonStyle', null);
 		if($buttonStyle!==null)
 			$cancelButtonStyle->mergeWith($buttonStyle);
 
@@ -1012,10 +1012,10 @@ 
 	 */
 	protected function getHistory()
 	{
-		if(($history=$this->getControlState('History',null))===null)
+		if(($history=$this->getControlState('History', null))===null)
 		{
 			$history=new TStack;
-			$this->setControlState('History',$history);
+			$this->setControlState('History', $history);
 		}
 		return $history;
 	}
@@ -1030,14 +1030,14 @@ 
 		if(($type=$wizardStep->getStepType())===TWizardStepType::Auto)
 		{
 			$steps=$this->getWizardSteps();
-			if(($index=$steps->indexOf($wizardStep))>=0)
+			if(($index=$steps->indexOf($wizardStep)) >= 0)
 			{
 				$stepCount=$steps->getCount();
-				if($stepCount===1 || ($index<$stepCount-1 && $steps->itemAt($index+1)->getStepType()===TWizardStepType::Complete))
+				if($stepCount===1 || ($index < $stepCount - 1 && $steps->itemAt($index + 1)->getStepType()===TWizardStepType::Complete))
 					return TWizardStepType::Finish;
 				else if($index===0)
 					return TWizardStepType::Start;
-				else if($index===$stepCount-1)
+				else if($index===$stepCount - 1)
 					return TWizardStepType::Finish;
 				else
 					return TWizardStepType::Step;
@@ -1106,8 +1106,8 @@ 
 
 			if(($this->_sideBarDataList=$this->_sideBar->findControl(self::ID_SIDEBAR_LIST))!==null)
 			{
-				$this->_sideBarDataList->attachEventHandler('OnItemCommand',array($this,'dataListItemCommand'));
-				$this->_sideBarDataList->attachEventHandler('OnItemDataBound',array($this,'dataListItemDataBound'));
+				$this->_sideBarDataList->attachEventHandler('OnItemCommand', array($this, 'dataListItemCommand'));
+				$this->_sideBarDataList->attachEventHandler('OnItemDataBound', array($this, 'dataListItemDataBound'));
 				$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
@@ -1127,7 +1127,7 @@ 
 	 * @param mixed sender of the event
 	 * @param TDataListCommandEventParameter
 	 */
-	public function dataListItemCommand($sender,$param)
+	public function dataListItemCommand($sender, $param)
 	{
 		$item=$param->getItem();
 		if($param->getCommandName()===self::CMD_MOVETO)
@@ -1163,7 +1163,7 @@ 
 	 * @param mixed sender of the event
 	 * @param TDataListItemEventParameter
 	 */
-	public function dataListItemDataBound($sender,$param)
+	public function dataListItemDataBound($sender, $param)
 	{
 		$item=$param->getItem();
 		$itemType=$item->getItemType();
@@ -1286,20 +1286,20 @@ 
 	protected function getPreviousStepIndex($popStack)
 	{
 		$history=$this->getHistory();
-		if($history->getCount()>=0)
+		if($history->getCount() >= 0)
 		{
 			$activeStepIndex=$this->getActiveStepIndex();
 			$previousStepIndex=-1;
 			if($popStack)
 			{
 				$previousStepIndex=$history->pop();
-				if($activeStepIndex===$previousStepIndex && $history->getCount()>0)
+				if($activeStepIndex===$previousStepIndex && $history->getCount() > 0)
 					$previousStepIndex=$history->pop();
 			}
 			else
 			{
 				$previousStepIndex=$history->peek();
-				if($activeStepIndex===$previousStepIndex && $history->getCount()>1)
+				if($activeStepIndex===$previousStepIndex && $history->getCount() > 1)
 				{
 					$saveIndex=$history->pop();
 					$previousStepIndex=$history->peek();
@@ -1343,12 +1343,12 @@ 
 	 * @param TEventParameter event parameter
 	 * @throws TInvalidDataValueException if a navigation command is associated with an invalid parameter
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
 			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_CANCEL)===0)
+			if(strcasecmp($command, self::CMD_CANCEL)===0)
 			{
 				$this->onCancelButtonClick($param);
 				return true;
@@ -1364,49 +1364,49 @@ 
 			$movePrev=false;
 			$this->_activeStepIndexSet=false;
 
-			if(strcasecmp($command,self::CMD_NEXT)===0)
+			if(strcasecmp($command, self::CMD_NEXT)===0)
 			{
 				if($type!==self::ST_START && $type!==self::ST_STEP)
-					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_NEXT);
-				if($index<$this->getWizardSteps()->getCount()-1)
-					$navParam->setNextStepIndex($index+1);
+					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_NEXT);
+				if($index < $this->getWizardSteps()->getCount() - 1)
+					$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);
+					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_PREVIOUS);
 				$movePrev=true;
-				if(($prevIndex=$this->getPreviousStepIndex(false))>=0)
+				if(($prevIndex=$this->getPreviousStepIndex(false)) >= 0)
 					$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);
-				if($index<$this->getWizardSteps()->getCount()-1)
-					$navParam->setNextStepIndex($index+1);
+					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_COMPLETE);
+				if($index < $this->getWizardSteps()->getCount() - 1)
+					$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);
 				$requestedStep=$param->getCommandParameter();
-				if (!is_numeric($requestedStep))
+				if(!is_numeric($requestedStep))
 				{
 					$requestedIndex=-1;
-					foreach ($this->getWizardSteps() as $index=>$step)
-						if ($step->getId()===$requestedStep)
+					foreach($this->getWizardSteps() as $index=>$step)
+						if($step->getId()===$requestedStep)
 						{
 							$requestedIndex=$index;
 							break;
 						}
-					if ($requestedIndex<0)
+					if($requestedIndex < 0)
 						throw new TConfigurationException('wizard_step_invalid');
 				}
 				else
@@ -1423,7 +1423,7 @@ 
 					if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($nextStepIndex))
 					{
 						if($movePrev)
-							$this->getPreviousStepIndex(true);  // pop out the previous move from history
+							$this->getPreviousStepIndex(true); // pop out the previous move from history
 						$this->setActiveStepIndex($nextStepIndex);
 					}
 				}
@@ -1477,7 +1477,7 @@ 
 	 */
 	public function getTitle()
 	{
-		return $this->getViewState('Title','');
+		return $this->getViewState('Title', '');
 	}
 
 	/**
@@ -1485,7 +1485,7 @@ 
 	 */
 	public function setTitle($value)
 	{
-		$this->setViewState('Title',$value,'');
+		$this->setViewState('Title', $value, '');
 		if($this->_wizard)
 			$this->_wizard->wizardStepsChanged();
 	}
@@ -1495,7 +1495,7 @@ 
 	 */
 	public function getAllowReturn()
 	{
-		return $this->getViewState('AllowReturn',true);
+		return $this->getViewState('AllowReturn', true);
 	}
 
 	/**
@@ -1503,7 +1503,7 @@ 
 	 */
 	public function setAllowReturn($value)
 	{
-		$this->setViewState('AllowReturn',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('AllowReturn', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -1511,7 +1511,7 @@ 
 	 */
 	public function getStepType()
 	{
-		return $this->getViewState('StepType',TWizardStepType::Auto);
+		return $this->getViewState('StepType', TWizardStepType::Auto);
 	}
 
 	/**
@@ -1519,10 +1519,10 @@ 
 	 */
 	public function setStepType($type)
 	{
-		$type=TPropertyValue::ensureEnum($type,'TWizardStepType');
+		$type=TPropertyValue::ensureEnum($type, 'TWizardStepType');
 		if($type!==$this->getStepType())
 		{
-			$this->setViewState('StepType',$type,TWizardStepType::Auto);
+			$this->setViewState('StepType', $type, TWizardStepType::Auto);
 			if($this->_wizard)
 				$this->_wizard->wizardStepsChanged();
 		}
@@ -1698,12 +1698,12 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item being added is not TWizardStep.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TWizardStep)
 		{
-			parent::insertAt($index,$item);
-			$this->_wizard->getMultiView()->getViews()->insertAt($index,$item);
+			parent::insertAt($index, $item);
+			$this->_wizard->getMultiView()->getViews()->insertAt($index, $item);
 			$this->_wizard->addedWizardStep($item);
 		}
 		else
@@ -1977,7 +1977,7 @@ 
 	 * @param string command name for the button's OnCommand event
 	 * @throws TInvalidDataValueException if the button type is not recognized
 	 */
-	protected function createNavigationButton($buttonStyle,$causesValidation,$commandName)
+	protected function createNavigationButton($buttonStyle, $causesValidation, $commandName)
 	{
 		switch($buttonStyle->getButtonType())
 		{
@@ -1992,7 +1992,7 @@ 
 				$button->setImageUrl($buttonStyle->getImageUrl());
 				break;
 			default:
-				throw new TInvalidDataValueException('wizard_buttontype_unknown',$buttonStyle->getButtonType());
+				throw new TInvalidDataValueException('wizard_buttontype_unknown', $buttonStyle->getButtonType());
 		}
 		$button->setText($buttonStyle->getButtonText());
 		$button->setCausesValidation($causesValidation);
@@ -2017,8 +2017,8 @@ 
 	 */
 	public function instantiateIn($parent)
 	{
-		$nextButton=$this->createNavigationButton($this->getWizard()->getStartNextButtonStyle(),true,TWizard::CMD_NEXT);
-		$cancelButton=$this->createNavigationButton($this->getWizard()->getCancelButtonStyle(),false,TWizard::CMD_CANCEL);
+		$nextButton=$this->createNavigationButton($this->getWizard()->getStartNextButtonStyle(), true, TWizard::CMD_NEXT);
+		$cancelButton=$this->createNavigationButton($this->getWizard()->getCancelButtonStyle(), false, TWizard::CMD_CANCEL);
 
 		$controls=$parent->getControls();
 		$controls->add($nextButton);
@@ -2046,9 +2046,9 @@ 
 	 */
 	public function instantiateIn($parent)
 	{
-		$previousButton=$this->createNavigationButton($this->getWizard()->getFinishPreviousButtonStyle(),false,TWizard::CMD_PREVIOUS);
-		$completeButton=$this->createNavigationButton($this->getWizard()->getFinishCompleteButtonStyle(),true,TWizard::CMD_COMPLETE);
-		$cancelButton=$this->createNavigationButton($this->getWizard()->getCancelButtonStyle(),false,TWizard::CMD_CANCEL);
+		$previousButton=$this->createNavigationButton($this->getWizard()->getFinishPreviousButtonStyle(), false, TWizard::CMD_PREVIOUS);
+		$completeButton=$this->createNavigationButton($this->getWizard()->getFinishCompleteButtonStyle(), true, TWizard::CMD_COMPLETE);
+		$cancelButton=$this->createNavigationButton($this->getWizard()->getCancelButtonStyle(), false, TWizard::CMD_CANCEL);
 
 		$controls=$parent->getControls();
 		$controls->add($previousButton);
@@ -2079,9 +2079,9 @@ 
 	 */
 	public function instantiateIn($parent)
 	{
-		$previousButton=$this->createNavigationButton($this->getWizard()->getStepPreviousButtonStyle(),false,TWizard::CMD_PREVIOUS);
-		$nextButton=$this->createNavigationButton($this->getWizard()->getStepNextButtonStyle(),true,TWizard::CMD_NEXT);
-		$cancelButton=$this->createNavigationButton($this->getWizard()->getCancelButtonStyle(),false,TWizard::CMD_CANCEL);
+		$previousButton=$this->createNavigationButton($this->getWizard()->getStepPreviousButtonStyle(), false, TWizard::CMD_PREVIOUS);
+		$nextButton=$this->createNavigationButton($this->getWizard()->getStepNextButtonStyle(), true, TWizard::CMD_NEXT);
+		$cancelButton=$this->createNavigationButton($this->getWizard()->getCancelButtonStyle(), false, TWizard::CMD_CANCEL);
 
 		$controls=$parent->getControls();
 		$controls->add($previousButton);

framework/Web/UI/WebControls/TTableRow.php

Spacing +4 added lines, -4 removed lines

@@ -123,7 +123,7 @@ 
 	 */
 	public function getTableSection()
 	{
-		return $this->getViewState('TableSection',TTableRowSection::Body);
+		return $this->getViewState('TableSection', TTableRowSection::Body);
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 */
 	public function setTableSection($value)
 	{
-		$this->setViewState('TableSection',TPropertyValue::ensureEnum($value,'TTableRowSection'),TTableRowSection::Body);
+		$this->setViewState('TableSection', TPropertyValue::ensureEnum($value, 'TTableRowSection'), TTableRowSection::Body);
 	}
 
 	/**
@@ -171,10 +171,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TTableCell object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TTableCell)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tablecellcollection_tablecell_required');
 	}

framework/Web/UI/WebControls/TKeyboard.php

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
 	 */
 	public function getForControl()
 	{
-		return $this->getViewState('ForControl','');
+		return $this->getViewState('ForControl', '');
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		if($this->getPage()->getClientSupportsJavaScript())
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	{
 		if(($url=$this->getCssUrl())==='')
 			$url=$this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'keyboard.css');
-		$this->getPage()->getClientScript()->registerStyleSheetFile($url,$url);
+		$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 	}
 
 	/**
@@ -174,12 +174,12 @@ 
 		if(($forControl=$this->getForControl())==='')
 			throw new TConfigurationException('keyboard_forcontrol_required');
 	    if(($target=$this->findControl($forControl))===null)
-	        throw new TConfigurationException('keyboard_forcontrol_invalid',$forControl);
+	        throw new TConfigurationException('keyboard_forcontrol_invalid', $forControl);
 
-	    $options['ID'] = $this->getClientID();
-	    $options['ForControl'] = $target->getClientID();
-	    $options['AutoHide'] = $this->getAutoHide();
-	    $options['CssClass'] = $this->getKeyboardCssClass();
+	    $options['ID']=$this->getClientID();
+	    $options['ForControl']=$target->getClientID();
+	    $options['AutoHide']=$this->getAutoHide();
+	    $options['CssClass']=$this->getKeyboardCssClass();
 
 	    return $options;
 	}

framework/Web/UI/WebControls/TImage.php

Spacing +12 added lines, -12 removed lines

@@ -39,12 +39,12 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$writer->addAttribute('src',$this->getImageUrl());
-		$writer->addAttribute('alt',$this->getAlternateText());
+		$writer->addAttribute('src', $this->getImageUrl());
+		$writer->addAttribute('alt', $this->getAlternateText());
 		if(($desc=$this->getDescriptionUrl())!=='')
-			$writer->addAttribute('longdesc',$desc);
+			$writer->addAttribute('longdesc', $desc);
 		if(($align=$this->getImageAlign())!=='')
-			$writer->addAttribute('align',$align);
+			$writer->addAttribute('align', $align);
 		parent::addAttributesToRender($writer);
 	}
 
@@ -62,7 +62,7 @@ 
 	 */
 	public function getAlternateText()
 	{
-		return $this->getViewState('AlternateText','');
+		return $this->getViewState('AlternateText', '');
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		$this->setViewState('AlternateText',$value,'');
+		$this->setViewState('AlternateText', $value, '');
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function getImageAlign()
 	{
-		return $this->getViewState('ImageAlign','');
+		return $this->getViewState('ImageAlign', '');
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		$this->setViewState('ImageAlign',$value,'');
+		$this->setViewState('ImageAlign', $value, '');
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->getViewState('ImageUrl','');
+		return $this->getViewState('ImageUrl', '');
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		$this->setViewState('ImageUrl',$value,'');
+		$this->setViewState('ImageUrl', $value, '');
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function getDescriptionUrl()
 	{
-		return $this->getViewState('DescriptionUrl','');
+		return $this->getViewState('DescriptionUrl', '');
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		$this->setViewState('DescriptionUrl',$value,'');
+		$this->setViewState('DescriptionUrl', $value, '');
 	}
 }