pradosoft / prado

framework/Web/UI/WebControls/TTableCell.php

Indentation +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
 
 	/**
 	 * Sets the horizontal alignment of the contents within the table item.
-     * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
+	 * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
 	 * @param string the horizontal alignment
 	 */
 	public function setHorizontalAlign($value)
@@ -110,7 +110,7 @@ 
 
 	/**
 	 * Sets the vertical alignment of the contents within the table item.
-     * Valid values include 'NotSet','Top','Bottom','Middle'
+	 * Valid values include 'NotSet','Top','Bottom','Middle'
 	 * @param string the horizontal alignment
 	 */
 	public function setVerticalAlign($value)

Spacing +6 added lines, -6 removed lines

@@ -151,7 +151,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -197,10 +197,10 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if(($colspan=$this->getColumnSpan())>0)
-			$writer->addAttribute('colspan',"$colspan");
-		if(($rowspan=$this->getRowSpan())>0)
-			$writer->addAttribute('rowspan',"$rowspan");
+		if(($colspan=$this->getColumnSpan()) > 0)
+			$writer->addAttribute('colspan', "$colspan");
+		if(($rowspan=$this->getRowSpan()) > 0)
+			$writer->addAttribute('rowspan', "$rowspan");
 	}
 
 	/**

framework/Util/TBehavior.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * TBehavior class file.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2009 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
+	 * TBehavior class file.
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link http://www.yiiframework.com/
+	 * @copyright Copyright &copy; 2008-2009 Yii Software LLC
+	 * @license http://www.yiiframework.com/license/
+	 */
 
 /**
  * TBehavior is a convenient base class for behavior classes.

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	{
 		$this->_owner=$owner;
 		foreach($this->events() as $event=>$handler)
-			$owner->attachEventHandler($event,array($this,$handler));
+			$owner->attachEventHandler($event, array($this, $handler));
 	}
 
 	/**
@@ -56,7 +56,7 @@ 
 	public function detach($owner)
 	{
 		foreach($this->events() as $event=>$handler)
-			$owner->detachEventHandler($event,array($this,$handler));
+			$owner->detachEventHandler($event, array($this, $handler));
 		$this->_owner=null;
 	}
 

framework/Web/UI/JuiControls/TJuiDatePicker.php

Indentation +10 added lines, -10 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * TJuiDatePicker class file.
- *
- * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
- * @link http://www.landwehr-software.de/
- * @copyright Copyright &copy; 2015 LANDWEHR Computer und Software GmbH
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TJuiDatePicker class file.
+	 *
+	 * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
+	 * @link http://www.landwehr-software.de/
+	 * @copyright Copyright &copy; 2015 LANDWEHR Computer und Software GmbH
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 /**
  * Load active text box.
@@ -90,10 +90,10 @@ 
 	{
 		return array('altField', 'altFormat', 'appendText', 'autoSize', 'buttonImage', 'buttonImageOnly', 'buttonText', 'calculateWeek',
 								 'changeMonth', 'changeYear', 'closeText', 'constrainInput', 'currentText', 'dateFormat', 'dayNames', 'dayNamesMin',
-				         'dayNamesShort', 'defaultDate', 'duration', 'firstDay', 'gotoCurrent', 'hideIfNoPrevNext', 'isRTL', 'maxDate',
+						 'dayNamesShort', 'defaultDate', 'duration', 'firstDay', 'gotoCurrent', 'hideIfNoPrevNext', 'isRTL', 'maxDate',
 								 'minDate', 'monthNames', 'monthNamesShort', 'navigationAsDateFormat', 'nextText', 'numberOfMonths', 'prevText',
 								 'selectOtherMonths', 'shortYearCutoff', 'showAnim', 'showButtonPanel', 'showCurrentAtPos', 'showMonthAfterYear',
-				         'showOn', 'showOptions', 'showOtherMonths', 'showWeek', 'stepMonths', 'weekHeader', 'yearRange', 'yearSuffix',
+						 'showOn', 'showOptions', 'showOtherMonths', 'showWeek', 'stepMonths', 'weekHeader', 'yearRange', 'yearSuffix',
 								 'beforeShow', 'beforeShowDay', 'onChangeMonthYear', 'onClose', 'onSelect');
 	}
 

Spacing +14 added lines, -14 removed lines

@@ -39,7 +39,7 @@ 
 	 * it will register an additional clientscript to set the language specific global default settings.
 	 * @var boolean true, if this is the first instance of TJuiDatePicker, false otherwise
 	 */
-	private static $_first = true;
+	private static $_first=true;
 
 	/**
 	 * Creates a new callback control, sets the adapter to
@@ -74,7 +74,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -168,8 +168,8 @@ 
 	 */
 	protected function getCurrentCulture()
 	{
-		$app = $this->getApplication()->getGlobalization(false);
-		return $this->getCulture() == '' ?
+		$app=$this->getApplication()->getGlobalization(false);
+		return $this->getCulture()=='' ?
 				($app ? $app->getCulture() : 'en') : $this->getCulture();
 	}
 
@@ -178,7 +178,7 @@ 
 	 */
 	public function getDateFormat()
 	{
-		return $this->getViewState('DateFormat','dd-MM-yyyy');
+		return $this->getViewState('DateFormat', 'dd-MM-yyyy');
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 */
 	public function setDateFormat($value)
 	{
-		$this->setViewState('DateFormat',$value,'dd-MM-yyyy');
+		$this->setViewState('DateFormat', $value, 'dd-MM-yyyy');
 	}
 
 	/**
@@ -253,8 +253,8 @@ 
 			$this->setText('');
 		else
 		{
-			$date = TPropertyValue::ensureFloat($value);
-			$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$this->getDateFormat());
+			$date=TPropertyValue::ensureFloat($value);
+			$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $this->getDateFormat());
 			$this->setText($formatter->format($date));
 		}
 	}
@@ -265,9 +265,9 @@ 
 	 */
 	protected function getTimeStampFromText()
 	{
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
 		return $formatter->parse($this->getText());
 	}
 
@@ -278,10 +278,10 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if(($text=$this->getText())==='')
 			return '';
-		$date = $this->getTimeStamp();
-		return $date == null ? $text : $date;
+		$date=$this->getTimeStamp();
+		return $date==null ? $text : $date;
 	}
 
 }
\ No newline at end of file

framework/Web/UI/WebControls/TPanel.php

Indentation +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 
 	/**
 	 * Sets the horizontal alignment of the contents within the panel.
-     * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
+	 * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
 	 * @param string the horizontal alignment
 	 */
 	public function setHorizontalAlign($value)

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		if(($butt=$this->getDefaultButton())!=='')
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getGroupingText()
 	{
-		return $this->getViewState('GroupingText','');
+		return $this->getViewState('GroupingText', '');
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function setGroupingText($value)
 	{
-		$this->setViewState('GroupingText',$value,'');
+		$this->setViewState('GroupingText', $value, '');
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 		if(($butt=$this->getDefaultButton())!=='')
 		{
 			if(($button=$this->findControl($butt))===null)
-				throw new TInvalidDataValueException('panel_defaultbutton_invalid',$butt);
+				throw new TInvalidDataValueException('panel_defaultbutton_invalid', $butt);
 			else
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}

framework/Web/UI/ActiveControls/TActiveLabel.php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
-	    parent::addAttributesToRender($writer);
+		$writer->addAttribute('id',$this->getClientID());
+		parent::addAttributesToRender($writer);
 	}
 
 	/**

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -71,7 +71,7 @@ 
 	 */
 	public function setForControl($value)
 	{
-		if(parent::getForControl() === $value)
+		if(parent::getForControl()===$value)
 			return;
 
 		parent::setForControl($value);
@@ -87,7 +87,7 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
+	    $writer->addAttribute('id', $this->getClientID());
 	    parent::addAttributesToRender($writer);
 	}
 }

framework/Web/UI/ActiveControls/TActiveDataList.php

Indentation +27 added lines, -27 removed lines

@@ -31,8 +31,8 @@ 
    */
   public function __construct()
   {
-    parent::__construct();
-    $this->setAdapter(new TActiveControlAdapter($this));
+	parent::__construct();
+	$this->setAdapter(new TActiveControlAdapter($this));
   }
 
   /**
@@ -40,7 +40,7 @@ 
    */
   public function getActiveControl()
   {
-    return $this->getAdapter()->getBaseActiveControl();
+	return $this->getAdapter()->getBaseActiveControl();
   }
 
   /**
@@ -52,11 +52,11 @@ 
    */
   public function setDataSource($value)
   {
-    parent::setDataSource($value);
-    if($this->getActiveControl()->canUpdateClientSide()) {
-      $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
-    }
+	parent::setDataSource($value);
+	if($this->getActiveControl()->canUpdateClientSide()) {
+	  $this->renderPager();
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+	}
   }
 
   /**
@@ -65,7 +65,7 @@ 
    */
   protected function getContainerID()
   {
-    return $this->ClientID.'_Container';
+	return $this->ClientID.'_Container';
   }
 
   /**
@@ -76,13 +76,13 @@ 
    */
   public function render($writer)
   {
-    if($this->getHasPreRendered()) {
-      $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
-    }
+	if($this->getHasPreRendered()) {
+	  $this->renderDataList($writer);
+	  if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+	}
+	else {
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+	}
   }
 
   /**
@@ -92,14 +92,14 @@ 
    */
   private function renderPager()
   {
-    $pager=$this->getPage()->findControlsByType('TActivePager', false);
-    foreach($pager as $item)
-    {
-      if($item->ControlToPaginate==$this->ID) {
-        $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
-      }
-    }
+	$pager=$this->getPage()->findControlsByType('TActivePager', false);
+	foreach($pager as $item)
+	{
+	  if($item->ControlToPaginate==$this->ID) {
+		$writer=$this->getResponse()->createHtmlWriter();
+		$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+	  }
+	}
   }
 
   /**
@@ -109,8 +109,8 @@ 
    */
   private function renderDataList($writer)
   {
-    $writer->write('<span id="'.$this->getContainerID().'">');
-    parent::render($writer);
-    $writer->write('</span>');
+	$writer->write('<span id="'.$this->getContainerID().'">');
+	parent::render($writer);
+	$writer->write('</span>');
   }
 }

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
       if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
+    } else {
       $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
     }
   }

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
     parent::setDataSource($value);
     if($this->getActiveControl()->canUpdateClientSide()) {
       $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+      $this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
     }
   }
 
@@ -78,10 +78,10 @@ 
   {
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
     }
     else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+      $this->getPage()->getAdapter()->registerControlToRender($this, $writer);
     }
   }
 
@@ -97,7 +97,7 @@ 
     {
       if($item->ControlToPaginate==$this->ID) {
         $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+        $this->getPage()->getAdapter()->registerControlToRender($item, $writer);
       }
     }
   }

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Doc Comments +4 added lines, -3 removed lines

@@ -199,7 +199,7 @@ 
 	}
 
 	/**
-	 * @return boolean true to post the inputs of the form on callback, default
+	 * @return string true to post the inputs of the form on callback, default
 	 * is post the inputs on callback.
 	 */
 	public function getPostState()
@@ -217,7 +217,7 @@ 
 	}
 
 	/**
-	 * @return integer callback request timeout.
+	 * @return string callback request timeout.
 	 */
 	public function getRequestTimeOut()
 	{
@@ -261,6 +261,7 @@ 
 	 * update. This will automatically set HasPrority to true.
 	 * @param boolean true enables the callback response to update the
 	 * viewstate.
+	 * @param boolean $value
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
@@ -269,7 +270,7 @@ 
 	}
 
 	/**
-	 * @return boolean client-side viewstate will be updated on callback
+	 * @return boolean|string client-side viewstate will be updated on callback
 	 * response if true. Default is true.
 	 */
 	public function getEnablePageStateUpdate()

Spacing +3 added lines, -3 removed lines

@@ -264,7 +264,7 @@ 
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
-		$enabled = TPropertyValue::ensureBoolean($value);
+		$enabled=TPropertyValue::ensureBoolean($value);
 		$this->setOption('EnablePageStateUpdate', $enabled);
 	}
 
@@ -274,7 +274,7 @@ 
 	 */
 	public function getEnablePageStateUpdate()
 	{
-		$option = $this->getOption('EnablePageStateUpdate');
+		$option=$this->getOption('EnablePageStateUpdate');
 		return ($option===null) ? true : $option;
 	}
 
@@ -292,7 +292,7 @@ 
 	public function setPostBackTarget($value)
 	{
 		if($value instanceof TControl)
-			$value = $value->getUniqueID();
+			$value=$value->getUniqueID();
 		$this->setOption('EventTarget', $value);
 	}
 

framework/Web/UI/ActiveControls/TActiveMultiView.php

Indentation +31 added lines, -31 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * TActiveMultiView class file
- *
- * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
- * @link http://www.landwehr-software.de/
- * @copyright Copyright &copy; 2009 LANDWEHR Computer und Software GmbH
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TActiveMultiView class file
+	 *
+	 * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
+	 * @link http://www.landwehr-software.de/
+	 * @copyright Copyright &copy; 2009 LANDWEHR Computer und Software GmbH
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 /**
  * Includes the following used classes
@@ -30,9 +30,9 @@ 
 class TActiveMultiView extends TMultiView implements IActiveControl
 {
 	/**
-	* Creates a new callback control, sets the adapter to
-	* TActiveControlAdapter.
-	*/
+	 * Creates a new callback control, sets the adapter to
+	 * TActiveControlAdapter.
+	 */
 	public function __construct()
 	{
 		parent::__construct();
@@ -40,28 +40,28 @@ 
 	}
 
 	/**
-	* @return TBaseActiveControl standard active control options.
-	*/
+	 * @return TBaseActiveControl standard active control options.
+	 */
 	public function getActiveControl()
 	{
 		return $this->getAdapter()->getBaseActiveControl();
 	}
 
 	/**
-	* Returns the id of the surrounding container (span).
-	* @return string container id
-	*/
+	 * Returns the id of the surrounding container (span).
+	 * @return string container id
+	 */
 	protected function getContainerID()
 	{
 		return $this->ClientID.'_Container';
 	}
 
 	/**
-	* Renders the TActiveMultiView.
-	* If the MutliView did not pass the prerender phase yet, it will register itself for rendering later.
-	* Else it will call the {@link renderMultiView()} method which will do the rendering of the MultiView.
-	* @param THtmlWriter writer for the rendering purpose
-	*/
+	 * Renders the TActiveMultiView.
+	 * If the MutliView did not pass the prerender phase yet, it will register itself for rendering later.
+	 * Else it will call the {@link renderMultiView()} method which will do the rendering of the MultiView.
+	 * @param THtmlWriter writer for the rendering purpose
+	 */
 	public function render($writer)
 	{
 		if($this->getHasPreRendered()) {
@@ -74,10 +74,10 @@ 
 	}
 
 	/**
-	* Renders the TActiveMultiView by writing a span tag with the container id obtained from {@link getContainerID()}
-	* which will be called by the replacement method of the client script to update it's content.
-	* @param $writer THtmlWriter writer for the rendering purpose
-	*/
+	 * Renders the TActiveMultiView by writing a span tag with the container id obtained from {@link getContainerID()}
+	 * which will be called by the replacement method of the client script to update it's content.
+	 * @param $writer THtmlWriter writer for the rendering purpose
+	 */
 	protected function renderMultiView($writer)
 	{
 		$writer->addAttribute('id', $this->getContainerID());
@@ -87,9 +87,9 @@ 
 	}
 
 	/**
-	* @param integer the zero-based index of the current view in the view collection. -1 if no active view.
-	* @throws TInvalidDataValueException if the view index is invalid
-	*/
+	 * @param integer the zero-based index of the current view in the view collection. -1 if no active view.
+	 * @throws TInvalidDataValueException if the view index is invalid
+	 */
 	public function setActiveViewIndex($value)
 	{
 		$old=parent::getActiveViewIndex();
@@ -99,9 +99,9 @@ 
 	}
 
 	/**
-	* @param TView the view to be activated
-	* @throws TInvalidOperationException if the view is not in the view collection
-	*/
+	 * @param TView the view to be activated
+	 * @throws TInvalidOperationException if the view is not in the view collection
+	 */
 	public function setActiveView($value)
 	{
 		$old=parent::getActiveView();

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +6 added lines, -6 removed lines

@@ -67,10 +67,10 @@ 
 		if($this->getHasPreRendered()) {
 			$this->renderMultiView($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+				$this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
 		}
 		else
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 	}
 
 	/**
@@ -92,12 +92,12 @@ 
 	*/
 	public function setActiveViewIndex($value)
 	{
-		if(parent::getActiveViewIndex() === $value)
+		if(parent::getActiveViewIndex()===$value)
 			return;
 
 		parent::setActiveViewIndex($value);
 		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 	}
 
 	/**
@@ -106,11 +106,11 @@ 
 	*/
 	public function setActiveView($value)
 	{
-		if(parent::getActiveView() === $value)
+		if(parent::getActiveView()===$value)
 			return;
 
 		parent::setActiveView($value);
 		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 	}
 }

framework/Web/UI/ActiveControls/TActiveDataGrid.php

Indentation +4 added lines, -4 removed lines

@@ -68,9 +68,9 @@ 
 	}
 
 	/**
-	* Creates a new callback control, sets the adapter to
-	* TActiveControlAdapter.
-	*/
+	 * Creates a new callback control, sets the adapter to
+	 * TActiveControlAdapter.
+	 */
 	public function __construct() {
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
@@ -111,7 +111,7 @@ 
 	 * @param string $value container tag
 	 */
 	public function setSurroundingTag($value) {
-    $this->_surroundingTag=TPropertyValue::ensureString($value);
+	$this->_surroundingTag=TPropertyValue::ensureString($value);
 	}
 
 	/**

Braces +34 added lines, -68 removed lines

@@ -145,8 +145,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else {
+		} else {
 			$button=new TActiveButton;
 			if(!$enabled)
 				$button->setEnabled(false);
@@ -180,8 +179,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);
 		}
 	}
@@ -248,8 +246,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -262,19 +259,16 @@ 
 					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
@@ -283,8 +277,7 @@ 
 						$image->setToolTip($text);
 					}
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');
@@ -376,8 +369,7 @@ 
 				$button->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 			$cell->getControls()->add($button);
 			$cell->registerObject('Button',$button);
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 }
@@ -416,8 +408,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -428,27 +419,23 @@ 
 						$button->setAlternateText($text);
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
 					if($text!=='')
 						$image->setAlternateText($text);
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');
@@ -491,8 +478,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -505,8 +491,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -514,11 +499,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -527,8 +510,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -574,8 +556,7 @@ 
 			$cell->registerObject('CheckBox',$checkBox);
 			if($this->getDataField()!=='')
 				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 
@@ -597,8 +578,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -611,8 +591,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -620,11 +599,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -633,8 +610,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -676,8 +652,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -690,8 +665,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -699,11 +673,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -712,8 +684,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -759,8 +730,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -773,19 +743,16 @@ 
 					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
@@ -794,8 +761,7 @@ 
 						$image->setToolTip($text);
 					}
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');

Spacing +25 added lines, -25 removed lines

@@ -94,7 +94,7 @@ 
 		parent::setDataSource($value);
 		if($this->getActiveControl()->canUpdateClientSide()) {
 			$this->renderPager();
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 		}
 	}
 
@@ -136,7 +136,7 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($pager,$buttonType,$enabled,$text,$commandName,$commandParameter) {
+	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter) {
 		if($buttonType===TDataGridPagerButtonType::LinkButton) {
 			if($enabled)
 				$button=new TActiveLinkButton;
@@ -179,10 +179,10 @@ 
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
+			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
 		}
 		else {
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 
@@ -196,7 +196,7 @@ 
 		foreach($pager as $item) {
 			if($item->ControlToPaginate==$this->ID) {
 				$writer=$this->getResponse()->createHtmlWriter();
-				$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 			}
 		}
 	}
@@ -208,7 +208,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	private function renderDataGrid($writer) {
-	  $writer->addAttribute('id',$this->getSurroundingTagID());
+	  $writer->addAttribute('id', $this->getSurroundingTagID());
 	  $writer->renderBeginTag($this->getSurroundingTag());
 		parent::render($writer);
 		$writer->renderEndTag();
@@ -234,7 +234,7 @@ 
  * @since 3.1.9
  */
 class TActiveBoundColumn extends TBoundColumn {
-	protected function initializeHeaderCell($cell,$columnIndex) {
+	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text=$this->getHeaderText();
 
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -313,7 +313,7 @@ 
  * @since 3.1.9
  */
 class TActiveEditCommandColumn extends TEditCommandColumn {
-	protected function createButton($commandName,$text,$causesValidation,$validationGroup) {
+	protected function createButton($commandName, $text, $causesValidation, $validationGroup) {
 		if($this->getButtonType()===TButtonColumnType::LinkButton)
 			$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 		else if($this->getButtonType()===TButtonColumnType::PushButton)
@@ -322,9 +322,9 @@ 
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
 				$button->setToolTip($text);
-				if(strcasecmp($commandName,'Update')===0)
+				if(strcasecmp($commandName, 'Update')===0)
 					$url=$this->getUpdateImageUrl();
-				else if(strcasecmp($commandName,'Cancel')===0)
+				else if(strcasecmp($commandName, 'Cancel')===0)
 						$url=$this->getCancelImageUrl();
 					else
 						$url=$this->getEditImageUrl();
@@ -355,7 +355,7 @@ 
  * @since 3.1.9
  */
 class TActiveButtonColumn extends TButtonColumn {
-	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) {
 			$buttonType=$this->getButtonType();
 			if($buttonType===TButtonColumnType::LinkButton)
@@ -373,12 +373,12 @@ 
 			$button->setCausesValidation($this->getCausesValidation());
 			$button->setValidationGroup($this->getValidationGroup());
 			if($this->getDataTextField()!=='' || ($buttonType===TButtonColumnType::ImageButton && $this->getDataImageUrlField()!==''))
-				$button->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$button->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 			$cell->getControls()->add($button);
-			$cell->registerObject('Button',$button);
+			$cell->registerObject('Button', $button);
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 }
 
@@ -402,7 +402,7 @@ 
  * @since 3.1.9
  */
 class TActiveTemplateColumn extends TTemplateColumn {
-	protected function initializeHeaderCell($cell,$columnIndex) {
+	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text=$this->getHeaderText();
 
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -473,7 +473,7 @@ 
 class TActiveHyperLinkColumn extends THyperLinkColumn
 {
 
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -562,7 +562,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)
 		{
@@ -571,15 +571,15 @@ 
 				$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);
 	}
 
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -658,7 +658,7 @@ 
  */
 class TActiveDropDownListColumn extends TDropDownListColumn
 {
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -745,7 +745,7 @@ 
  * @since 3.1.9
  */
 class TActiveLiteralColumn extends TLiteralColumn {
-	protected function initializeHeaderCell($cell,$columnIndex) {
+	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text=$this->getHeaderText();
 
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -821,8 +821,8 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_callbackoptions === null)
-			$this->_callbackoptions = new TCallbackOptions;
+		if($this->_callbackoptions===null)
+			$this->_callbackoptions=new TCallbackOptions;
 		return $this->_callbackoptions->getClientSide();
 	}
 }