pradosoft / prado

framework/Web/UI/TPage.php

Spacing +98 added lines, -98 removed lines

@@ -181,8 +181,8 @@ 
 	 */
 	public function run($writer)
 	{
-		Prado::trace("Running page life cycles",'System.Web.UI.TPage');
-		$this->_writer = $writer;
+		Prado::trace("Running page life cycles", 'System.Web.UI.TPage');
+		$this->_writer=$writer;
 
 		$this->determinePostBackMode();
 
@@ -196,85 +196,85 @@ 
 		else
 			$this->processNormalRequest($writer);
 
-		$this->_writer = null;
+		$this->_writer=null;
 	}
 
 	protected function processNormalRequest($writer)
 	{
-		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreInit()", 'System.Web.UI.TPage');
 		$this->onPreInit(null);
 
-		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page initRecursive()", 'System.Web.UI.TPage');
 		$this->initRecursive();
 
-		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onInitComplete()", 'System.Web.UI.TPage');
 		$this->onInitComplete(null);
 
-		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreLoad()", 'System.Web.UI.TPage');
 		$this->onPreLoad(null);
-		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page loadRecursive()", 'System.Web.UI.TPage');
 		$this->loadRecursive();
-		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onLoadComplete()", 'System.Web.UI.TPage');
 		$this->onLoadComplete(null);
 
-		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page preRenderRecursive()", 'System.Web.UI.TPage');
 		$this->preRenderRecursive();
-		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreRenderComplete()", 'System.Web.UI.TPage');
 		$this->onPreRenderComplete(null);
 
-		Prado::trace("Page savePageState()",'System.Web.UI.TPage');
+		Prado::trace("Page savePageState()", 'System.Web.UI.TPage');
 		$this->savePageState();
-		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onSaveStateComplete()", 'System.Web.UI.TPage');
 		$this->onSaveStateComplete(null);
 
-		Prado::trace("Page renderControl()",'System.Web.UI.TPage');
+		Prado::trace("Page renderControl()", 'System.Web.UI.TPage');
 		$this->renderControl($writer);
-		Prado::trace("Page unloadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page unloadRecursive()", 'System.Web.UI.TPage');
 		$this->unloadRecursive();
 	}
 
 	protected function processPostBackRequest($writer)
 	{
-		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreInit()", 'System.Web.UI.TPage');
 		$this->onPreInit(null);
 
-		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page initRecursive()", 'System.Web.UI.TPage');
 		$this->initRecursive();
 
-		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onInitComplete()", 'System.Web.UI.TPage');
 		$this->onInitComplete(null);
 
 		$this->_restPostData=new TMap;
-		Prado::trace("Page loadPageState()",'System.Web.UI.TPage');
+		Prado::trace("Page loadPageState()", 'System.Web.UI.TPage');
 		$this->loadPageState();
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_postData,true);
-		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_postData, true);
+		Prado::trace("Page onPreLoad()", 'System.Web.UI.TPage');
 		$this->onPreLoad(null);
-		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page loadRecursive()", 'System.Web.UI.TPage');
 		$this->loadRecursive();
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_restPostData,false);
-		Prado::trace("Page raiseChangedEvents()",'System.Web.UI.TPage');
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_restPostData, false);
+		Prado::trace("Page raiseChangedEvents()", 'System.Web.UI.TPage');
 		$this->raiseChangedEvents();
-		Prado::trace("Page raisePostBackEvent()",'System.Web.UI.TPage');
+		Prado::trace("Page raisePostBackEvent()", 'System.Web.UI.TPage');
 		$this->raisePostBackEvent();
-		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onLoadComplete()", 'System.Web.UI.TPage');
 		$this->onLoadComplete(null);
 
-		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page preRenderRecursive()", 'System.Web.UI.TPage');
 		$this->preRenderRecursive();
-		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreRenderComplete()", 'System.Web.UI.TPage');
 		$this->onPreRenderComplete(null);
 
-		Prado::trace("Page savePageState()",'System.Web.UI.TPage');
+		Prado::trace("Page savePageState()", 'System.Web.UI.TPage');
 		$this->savePageState();
-		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onSaveStateComplete()", 'System.Web.UI.TPage');
 		$this->onSaveStateComplete(null);
 
-		Prado::trace("Page renderControl()",'System.Web.UI.TPage');
+		Prado::trace("Page renderControl()", 'System.Web.UI.TPage');
 		$this->renderControl($writer);
-		Prado::trace("Page unloadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page unloadRecursive()", 'System.Web.UI.TPage');
 		$this->unloadRecursive();
 	}
 
@@ -286,7 +286,7 @@ 
 				$data[$k]=self::decodeUTF8($v, $enc);
 			return $data;
 		} elseif(is_string($data)) {
-			return iconv('UTF-8',$enc.'//IGNORE',$data);
+			return iconv('UTF-8', $enc.'//IGNORE', $data);
 		} else {
 			return $data;
 		}
@@ -303,39 +303,39 @@ 
 
 		$this->setAdapter(new TActivePageAdapter($this));
 
-        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+        $callbackEventParameter=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
         if(strlen($callbackEventParameter) > 0)
-            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string) $callbackEventParameter);
 
         // Decode Callback postData from UTF-8 to current Charset
-        if (($g=$this->getApplication()->getGlobalization(false))!==null &&
+        if(($g=$this->getApplication()->getGlobalization(false))!==null &&
             strtoupper($enc=$g->getCharset())!='UTF-8')
-                foreach ($this->_postData as $k=>$v)
+                foreach($this->_postData as $k=>$v)
                 	$this->_postData[$k]=self::decodeUTF8($v, $enc);
 
-		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreInit()", 'System.Web.UI.TPage');
 		$this->onPreInit(null);
 
-		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page initRecursive()", 'System.Web.UI.TPage');
 		$this->initRecursive();
 
-		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onInitComplete()", 'System.Web.UI.TPage');
 		$this->onInitComplete(null);
 
 		$this->_restPostData=new TMap;
-		Prado::trace("Page loadPageState()",'System.Web.UI.TPage');
+		Prado::trace("Page loadPageState()", 'System.Web.UI.TPage');
 		$this->loadPageState();
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_postData,true);
-		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_postData, true);
+		Prado::trace("Page onPreLoad()", 'System.Web.UI.TPage');
 		$this->onPreLoad(null);
-		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page loadRecursive()", 'System.Web.UI.TPage');
 		$this->loadRecursive();
 
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_restPostData,false);
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_restPostData, false);
 
-		Prado::trace("Page raiseChangedEvents()",'System.Web.UI.TPage');
+		Prado::trace("Page raiseChangedEvents()", 'System.Web.UI.TPage');
 		$this->raiseChangedEvents();
 
 
@@ -345,17 +345,17 @@ 
 		Prado::trace("Page raisePostBackEvent()",'System.Web.UI.TPage');
 		$this->raisePostBackEvent();
 */
-		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onLoadComplete()", 'System.Web.UI.TPage');
 		$this->onLoadComplete(null);
 
-		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page preRenderRecursive()", 'System.Web.UI.TPage');
 		$this->preRenderRecursive();
-		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreRenderComplete()", 'System.Web.UI.TPage');
 		$this->onPreRenderComplete(null);
 
-		Prado::trace("Page savePageState()",'System.Web.UI.TPage');
+		Prado::trace("Page savePageState()", 'System.Web.UI.TPage');
 		$this->savePageState();
-		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onSaveStateComplete()", 'System.Web.UI.TPage');
 		$this->onSaveStateComplete(null);
 
 /*
@@ -364,7 +364,7 @@ 
 */
 		$this->getAdapter()->renderCallbackResponse($writer);
 
-		Prado::trace("Page unloadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page unloadRecursive()", 'System.Web.UI.TPage');
 		$this->unloadRecursive();
 	}
 
@@ -375,7 +375,7 @@ 
 	 */
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
+		if($this->getAdapter()!==null)
 			return $this->getAdapter()->getCallbackClientHandler();
 		else
 			return new TCallbackClientScript();
@@ -457,7 +457,7 @@ 
 	{
 		if(!$this->_validators)
 			$this->_validators=new TList;
-		if(empty($validationGroup) === true)
+		if(empty($validationGroup)===true)
 			return $this->_validators;
 		else
 		{
@@ -477,7 +477,7 @@ 
 	 */
 	public function validate($validationGroup=null)
 	{
-		Prado::trace("Page validate()",'System.Web.UI.TPage');
+		Prado::trace("Page validate()", 'System.Web.UI.TPage');
 		$this->_validated=true;
 		if($this->_validators && $this->_validators->getCount())
 		{
@@ -535,7 +535,7 @@ 
 	 */
 	public function setTheme($value)
 	{
-		$this->_theme=empty($value)?null:$value;
+		$this->_theme=empty($value) ? null : $value;
 	}
 
 
@@ -555,7 +555,7 @@ 
 	 */
 	public function setStyleSheetTheme($value)
 	{
-		$this->_styleSheet=empty($value)?null:$value;
+		$this->_styleSheet=empty($value) ? null : $value;
 	}
 
 	/**
@@ -586,13 +586,13 @@ 
 	public function getClientScript()
 	{
 		if(!$this->_clientScript) {
-			$className = $classPath = $this->getService()->getClientScriptManagerClass();
+			$className=$classPath=$this->getService()->getClientScriptManagerClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
+			if(($pos=strrpos($className, '.'))!==false)
+				$className=substr($className, $pos + 1);
 
- 			if(!class_exists($className,false) || ($className!=='TClientScriptManager' && !is_subclass_of($className,'TClientScriptManager')))
-				throw new THttpException(404,'page_csmanagerclass_invalid',$classPath);
+ 			if(!class_exists($className, false) || ($className!=='TClientScriptManager' && !is_subclass_of($className, 'TClientScriptManager')))
+				throw new THttpException(404, 'page_csmanagerclass_invalid', $classPath);
 
 			$this->_clientScript=new $className($this);
 		}
@@ -610,7 +610,7 @@ 
 	 */
 	public function onPreInit($param)
 	{
-		$this->raiseEvent('OnPreInit',$this,$param);
+		$this->raiseEvent('OnPreInit', $this, $param);
 	}
 
 	/**
@@ -623,7 +623,7 @@ 
 	 */
 	public function onInitComplete($param)
 	{
-		$this->raiseEvent('OnInitComplete',$this,$param);
+		$this->raiseEvent('OnInitComplete', $this, $param);
 	}
 
 	/**
@@ -636,7 +636,7 @@ 
 	 */
 	public function onPreLoad($param)
 	{
-		$this->raiseEvent('OnPreLoad',$this,$param);
+		$this->raiseEvent('OnPreLoad', $this, $param);
 	}
 
 	/**
@@ -649,7 +649,7 @@ 
 	 */
 	public function onLoadComplete($param)
 	{
-		$this->raiseEvent('OnLoadComplete',$this,$param);
+		$this->raiseEvent('OnLoadComplete', $this, $param);
 	}
 
 	/**
@@ -662,23 +662,23 @@ 
 	 */
 	public function onPreRenderComplete($param)
 	{
-		$this->raiseEvent('OnPreRenderComplete',$this,$param);
+		$this->raiseEvent('OnPreRenderComplete', $this, $param);
 		$cs=$this->getClientScript();
 		$theme=$this->getTheme();
 		if($theme instanceof ITheme)
 		{
 			foreach($theme->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
+				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
 			foreach($theme->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+				$cs->registerHeadScriptFile($url, $url);
 		}
 		$styleSheet=$this->getStyleSheetTheme();
 		if($styleSheet instanceof ITheme)
 		{
 			foreach($styleSheet->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
+				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
 			foreach($styleSheet->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+				$cs->registerHeadScriptFile($url, $url);
 		}
 
 		if($cs->getRequiresHead() && $this->getHead()===null)
@@ -695,9 +695,9 @@ 
 	 */
 	private function getCssMediaType($url)
 	{
-		$segs=explode('.',basename($url));
+		$segs=explode('.', basename($url));
 		if(isset($segs[2]))
-			return $segs[count($segs)-2];
+			return $segs[count($segs) - 2];
 		else
 			return '';
 	}
@@ -711,7 +711,7 @@ 
 	 */
 	public function onSaveStateComplete($param)
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,$param);
+		$this->raiseEvent('OnSaveStateComplete', $this, $param);
 	}
 
 	/**
@@ -749,7 +749,7 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		$this->setViewState('ControlsRequiringPostBack',$this->_controlsRegisteredForPostData,array());
+		$this->setViewState('ControlsRequiringPostBack', $this->_controlsRegisteredForPostData, array());
 	}
 
 	/**
@@ -760,7 +760,7 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		$this->_controlsRequiringPostData=$this->getViewState('ControlsRequiringPostBack',array());
+		$this->_controlsRequiringPostData=$this->getViewState('ControlsRequiringPostBack', array());
 	}
 
 	/**
@@ -768,9 +768,9 @@ 
 	 */
 	protected function loadPageState()
 	{
-		Prado::trace("Loading state",'System.Web.UI.TPage');
+		Prado::trace("Loading state", 'System.Web.UI.TPage');
 		$state=$this->getStatePersister()->load();
-		$this->loadStateRecursive($state,$this->getEnableViewState());
+		$this->loadStateRecursive($state, $this->getEnableViewState());
 	}
 
 	/**
@@ -778,7 +778,7 @@ 
 	 */
 	protected function savePageState()
 	{
-		Prado::trace("Saving state",'System.Web.UI.TPage');
+		Prado::trace("Saving state", 'System.Web.UI.TPage');
 		$state=&$this->saveStateRecursive($this->getEnableViewState());
 		$this->getStatePersister()->save($state);
 	}
@@ -801,11 +801,11 @@ 
 	 */
 	public function registerRequiresPostData($control)
 	{
-		$id=is_string($control)?$control:$control->getUniqueID();
+		$id=is_string($control) ? $control : $control->getUniqueID();
 		$this->_controlsRegisteredForPostData[$id]=true;
 		$params=func_get_args();
 		foreach($this->getCachingStack() as $item)
-			$item->registerAction('Page','registerRequiresPostData',array($id));
+			$item->registerAction('Page', 'registerRequiresPostData', array($id));
 	}
 
 	/**
@@ -857,7 +857,7 @@ 
 	 * @param TMap post data to be processed
 	 * @param boolean whether this method is invoked before {@link onLoad OnLoad}.
 	 */
-	protected function processPostData($postData,$beforeLoad)
+	protected function processPostData($postData, $beforeLoad)
 	{
 		$this->_isLoadingPostData=true;
 		if($beforeLoad)
@@ -870,18 +870,18 @@ 
 			{
 				if($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$postData))
+					if($control->loadPostData($key, $postData))
 						$this->_controlsPostDataChanged[]=$control;
 				}
 				else if($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
-					$this->_postData->add(self::FIELD_POSTBACK_TARGET,$key);  // not calling setPostBackEventTarget() because the control may be removed later
+					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key); // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 			else if($beforeLoad)
-				$this->_restPostData->add($key,$value);
+				$this->_restPostData->add($key, $value);
 		}
 
 		foreach($this->_controlsRequiringPostData as $key=>$value)
@@ -890,11 +890,11 @@ 
 			{
 				if($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$this->_postData))
+					if($control->loadPostData($key, $this->_postData))
 						$this->_controlsPostDataChanged[]=$control;
 				}
 				else
-					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
+					throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 		}
@@ -945,7 +945,7 @@ 
 	public function ensureRenderInForm($control)
 	{
 		if(!$this->getIsCallback() && !$this->_inFormRender)
-			throw new TConfigurationException('page_control_outofform',get_class($control), $control ? $control->getUniqueID() : null);
+			throw new TConfigurationException('page_control_outofform', get_class($control), $control ? $control->getUniqueID() : null);
 	}
 
 	/**
@@ -956,7 +956,7 @@ 
 		if($this->_formRendered)
 			throw new TConfigurationException('page_form_duplicated');
 		$this->_formRendered=true;
-		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE,$this->getClientState());
+		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE, $this->getClientState());
 		$this->_inFormRender=true;
 	}
 
@@ -1186,12 +1186,12 @@ 
 	 * @param string method name of the context object
 	 * @param array list of parameters to be passed to the action method
 	 */
-	public function registerCachingAction($context,$funcName,$funcParams)
+	public function registerCachingAction($context, $funcName, $funcParams)
 	{
 		if($this->_cachingStack)
 		{
 			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context,$funcName,$funcParams);
+				$cache->registerAction($context, $funcName, $funcParams);
 		}
 	}
 
@@ -1210,7 +1210,7 @@ 
 	 */
 	public function flushWriter()
 	{
-		if ($this->_writer)
+		if($this->_writer)
 			$this->Response->write($this->_writer->flush());
 	}
 
@@ -1274,7 +1274,7 @@ 
 	 * @param mixed state data
 	 * @return string serialized data
 	 */
-	public static function serialize($page,$data)
+	public static function serialize($page, $data)
 	{
 		$sm=$page->getApplication()->getSecurityManager();
 		if($page->getEnableStateValidation())
@@ -1293,7 +1293,7 @@ 
 	 * @param string serialized data
 	 * @return mixed unserialized state data, null if data is corrupted
 	 */
-	public static function unserialize($page,$data)
+	public static function unserialize($page, $data)
 	{
 		$str=base64_decode($data);
 		if($str==='')

framework/Web/UI/WebControls/TDataListItemRenderer.php

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
 	 */
 	public function getHasStyle()
 	{
-		return $this->getViewState('Style',null)!==null;
+		return $this->getViewState('Style', null)!==null;
 	}
 
 	/**
@@ -53,12 +53,12 @@ 
 	 */
 	public function getStyle()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style;
 		else
 		{
 			$style=$this->createStyle();
-			$this->setViewState('Style',$style,null);
+			$this->setViewState('Style', $style, null);
 			return $style;
 		}
 	}
@@ -78,11 +78,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataListCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataListCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -109,7 +109,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			$style->addAttributesToRender($writer);
 	}
 

framework/Web/UI/WebControls/THyperLinkColumn.php

Spacing +30 added lines, -30 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function getDataTextField()
 	{
-		return $this->getViewState('DataTextField','');
+		return $this->getViewState('DataTextField', '');
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function setDataTextField($value)
 	{
-		$this->setViewState('DataTextField',$value,'');
+		$this->setViewState('DataTextField', $value, '');
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function getDataTextFormatString()
 	{
-		return $this->getViewState('DataTextFormatString','');
+		return $this->getViewState('DataTextFormatString', '');
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setDataTextFormatString($value)
 	{
-		$this->setViewState('DataTextFormatString',$value,'');
+		$this->setViewState('DataTextFormatString', $value, '');
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function getImageHeight()
 	{
-		return $this->getViewState('ImageHeight','');
+		return $this->getViewState('ImageHeight', '');
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setImageHeight($value)
 	{
-		$this->setViewState('ImageHeight',$value,'');
+		$this->setViewState('ImageHeight', $value, '');
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->getViewState('ImageUrl','');
+		return $this->getViewState('ImageUrl', '');
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		$this->setViewState('ImageUrl',$value,'');
+		$this->setViewState('ImageUrl', $value, '');
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function getImageWidth()
 	{
-		return $this->getViewState('ImageWidth','');
+		return $this->getViewState('ImageWidth', '');
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setImageWidth($value)
 	{
-		$this->setViewState('ImageWidth',$value,'');
+		$this->setViewState('ImageWidth', $value, '');
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public function getNavigateUrl()
 	{
-		return $this->getViewState('NavigateUrl','');
+		return $this->getViewState('NavigateUrl', '');
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		$this->setViewState('NavigateUrl',$value,'');
+		$this->setViewState('NavigateUrl', $value, '');
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getDataNavigateUrlField()
 	{
-		return $this->getViewState('DataNavigateUrlField','');
+		return $this->getViewState('DataNavigateUrlField', '');
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function setDataNavigateUrlField($value)
 	{
-		$this->setViewState('DataNavigateUrlField',$value,'');
+		$this->setViewState('DataNavigateUrlField', $value, '');
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function getDataNavigateUrlFormatString()
 	{
-		return $this->getViewState('DataNavigateUrlFormatString','');
+		return $this->getViewState('DataNavigateUrlFormatString', '');
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function setDataNavigateUrlFormatString($value)
 	{
-		$this->setViewState('DataNavigateUrlFormatString',$value,'');
+		$this->setViewState('DataNavigateUrlFormatString', $value, '');
 	}
 
 	/**
@@ -200,7 +200,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->getViewState('Target','');
+		return $this->getViewState('Target', '');
 	}
 
 	/**
@@ -209,7 +209,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		$this->setViewState('Target',$value,'');
+		$this->setViewState('Target', $value, '');
 	}
 
 	/**
@@ -220,12 +220,12 @@ 
 	 * @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)
 		{
 			$link=new THyperLink;
-			if(($url = $this->getImageUrl())!=='')
+			if(($url=$this->getImageUrl())!=='')
 			{
 				$link->setImageUrl($url);
 				if(($width=$this->getImageWidth())!=='')
@@ -237,12 +237,12 @@ 
 			$link->setNavigateUrl($this->getNavigateUrl());
 			$link->setTarget($this->getTarget());
 			if($this->getDataTextField()!=='' || $this->getDataNavigateUrlField()!=='')
-				$link->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$link->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 			$cell->getControls()->add($link);
-			$cell->registerObject('HyperLink',$link);
+			$cell->registerObject('HyperLink', $link);
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -250,20 +250,20 @@ 
 	 * 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->getDataTextField())!=='')
 		{
-			$value=$this->getDataFieldValue($data,$field);
-			$text=$this->formatDataValue($this->getDataTextFormatString(),$value);
+			$value=$this->getDataFieldValue($data, $field);
+			$text=$this->formatDataValue($this->getDataTextFormatString(), $value);
 			$sender->setText($text);
 		}
 		if(($field=$this->getDataNavigateUrlField())!=='')
 		{
-			$value=$this->getDataFieldValue($data,$field);
-			$url=$this->formatDataValue($this->getDataNavigateUrlFormatString(),$value);
+			$value=$this->getDataFieldValue($data, $field);
+			$url=$this->formatDataValue($this->getDataNavigateUrlFormatString(), $value);
 			$sender->setNavigateUrl($url);
 		}
 	}

framework/Web/UI/WebControls/TInlineFrame.php

Spacing +36 added lines, -36 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	public function getAlign()
 	{
-		return $this->getViewState('Align',TInlineFrameAlign::NotSet);
+		return $this->getViewState('Align', TInlineFrameAlign::NotSet);
 	}
 
 	/**
@@ -52,7 +52,7 @@ 
 	 */
 	public function setAlign($value)
 	{
-		$this->setViewState('Align',TPropertyValue::ensureEnum($value,'TInlineFrameAlign'),TInlineFrameAlign::NotSet);
+		$this->setViewState('Align', TPropertyValue::ensureEnum($value, 'TInlineFrameAlign'), TInlineFrameAlign::NotSet);
 	}
 
 	/**
@@ -60,7 +60,7 @@ 
 	 */
 	public function getDescriptionUrl()
 	{
-		return $this->getViewState('DescriptionUrl','');
+		return $this->getViewState('DescriptionUrl', '');
 	}
 
 	/**
@@ -68,7 +68,7 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		$this->setViewState('DescriptionUrl',$value,'');
+		$this->setViewState('DescriptionUrl', $value, '');
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 */
 	public function getShowBorder()
 	{
-		return $this->getViewState('ShowBorder',true);
+		return $this->getViewState('ShowBorder', true);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 */
 	public function setShowBorder($value)
 	{
-		$this->setViewState('ShowBorder',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowBorder', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public function getFrameUrl()
 	{
-		return $this->getViewState('FrameUrl','');
+		return $this->getViewState('FrameUrl', '');
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 */
 	public function setFrameUrl($value)
 	{
-		$this->setViewState('FrameUrl',$value,'');
+		$this->setViewState('FrameUrl', $value, '');
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 */
 	public function getScrollBars()
 	{
-		return $this->getViewState('ScrollBars',TInlineFrameScrollBars::Auto);
+		return $this->getViewState('ScrollBars', TInlineFrameScrollBars::Auto);
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	public function setScrollBars($value)
 	{
-		$this->setViewState('ScrollBars',TPropertyValue::ensureEnum($value,'TInlineFrameScrollBars'),TInlineFrameScrollBars::Auto);
+		$this->setViewState('ScrollBars', TPropertyValue::ensureEnum($value, 'TInlineFrameScrollBars'), TInlineFrameScrollBars::Auto);
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 */
 	public function getWidth()
 	{
-	  return $this->getViewState('Width',-1);
+	  return $this->getViewState('Width', -1);
 	}
 	
 	/**
@@ -158,9 +158,9 @@ 
 	 */
 	public function setWidth($value)
 	{
-	  if(($value=TPropertyValue::ensureInteger($value))<0)
+	  if(($value=TPropertyValue::ensureInteger($value)) < 0)
 	    $value=-1;
-	  $this->setViewState('Width',$value,-1);
+	  $this->setViewState('Width', $value, -1);
 	}
 	
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getHeight()
 	{
-	  return $this->getViewState('Height',-1);
+	  return $this->getViewState('Height', -1);
 	}
 	
 	/**
@@ -176,9 +176,9 @@ 
 	 */
 	public function setHeight($value)
 	{
-	  if(($value=TPropertyValue::ensureInteger($value))<0)
+	  if(($value=TPropertyValue::ensureInteger($value)) < 0)
 	    $value=-1;
-	  $this->setViewState('Height',$value,-1);
+	  $this->setViewState('Height', $value, -1);
 	}
 	
 	/**
@@ -187,7 +187,7 @@ 
 	 */
 	public function getMarginWidth()
 	{
-		return $this->getViewState('MarginWidth',-1);
+		return $this->getViewState('MarginWidth', -1);
 	}
 
 	/**
@@ -196,9 +196,9 @@ 
 	 */
 	public function setMarginWidth($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
-		$this->setViewState('MarginWidth',$value,-1);
+		$this->setViewState('MarginWidth', $value, -1);
 	}
 
 	/**
@@ -207,7 +207,7 @@ 
 	 */
 	public function getMarginHeight()
 	{
-		return $this->getViewState('MarginHeight',-1);
+		return $this->getViewState('MarginHeight', -1);
 	}
 
 	/**
@@ -216,9 +216,9 @@ 
 	 */
 	public function setMarginHeight($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
-		$this->setViewState('MarginHeight',$value,-1);
+		$this->setViewState('MarginHeight', $value, -1);
 	}
 
 	/**
@@ -229,37 +229,37 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		if($this->getID()!=='')
-			$writer->addAttribute('name',$this->getUniqueID());
+			$writer->addAttribute('name', $this->getUniqueID());
 
 		if(($src=$this->getFrameUrl())!=='')
-			$writer->addAttribute('src',$src);
+			$writer->addAttribute('src', $src);
 
 		if(($align=strtolower($this->getAlign()))!=='notset')
-			$writer->addAttribute('align',$align);
+			$writer->addAttribute('align', $align);
 
 		$scrollBars=$this->getScrollBars();
 		if($scrollBars===TInlineFrameScrollBars::None)
-			$writer->addAttribute('scrolling','no');
+			$writer->addAttribute('scrolling', 'no');
 		else if($scrollBars===TInlineFrameScrollBars::Both)
-			$writer->addAttribute('scrolling','yes');
+			$writer->addAttribute('scrolling', 'yes');
 
-		if (!$this->getShowBorder())
-			$writer->addAttribute('frameborder','0');
+		if(!$this->getShowBorder())
+			$writer->addAttribute('frameborder', '0');
 
 		if(($longdesc=$this->getDescriptionUrl())!=='')
-			$writer->addAttribute('longdesc',$longdesc);
+			$writer->addAttribute('longdesc', $longdesc);
 		
-		if (($width=$this->getWidth())!==-1)
-		  $writer->addAttribute('width',$width);
+		if(($width=$this->getWidth())!==-1)
+		  $writer->addAttribute('width', $width);
 		
-		if (($height=$this->getHeight())!==-1)
-		  $writer->addAttribute('height',$height);
+		if(($height=$this->getHeight())!==-1)
+		  $writer->addAttribute('height', $height);
 
 		if(($marginheight=$this->getMarginHeight())!==-1)
-			$writer->addAttribute('marginheight',$marginheight);
+			$writer->addAttribute('marginheight', $marginheight);
 
 		if(($marginwidth=$this->getMarginWidth())!==-1)
-			$writer->addAttribute('marginwidth',$marginwidth);
+			$writer->addAttribute('marginwidth', $marginwidth);
 
 		parent::addAttributesToRender($writer);
 	}

framework/Web/UI/WebControls/TFont.php

Spacing +30 added lines, -30 removed lines

@@ -62,12 +62,12 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_flags===0)
-			$exprops[] = "\0TFont\0_flags";
-		if ($this->_name==='')
-			$exprops[] = "\0TFont\0_name";
-		if ($this->_size==='')
-			$exprops[] = "\0TFont\0_size";
+		if($this->_flags===0)
+			$exprops[]="\0TFont\0_flags";
+		if($this->_name==='')
+			$exprops[]="\0TFont\0_name";
+		if($this->_size==='')
+			$exprops[]="\0TFont\0_size";
 	}
 
 	/**
@@ -83,11 +83,11 @@ 
 	 */
 	public function setBold($value)
 	{
-		$this->_flags |= self::IS_SET_BOLD;
+		$this->_flags|=self::IS_SET_BOLD;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_BOLD;
+			$this->_flags|=self::IS_BOLD;
 		else
-			$this->_flags &= ~self::IS_BOLD;
+			$this->_flags&=~self::IS_BOLD;
 	}
 
 	/**
@@ -103,11 +103,11 @@ 
 	 */
 	public function setItalic($value)
 	{
-		$this->_flags |= self::IS_SET_ITALIC;
+		$this->_flags|=self::IS_SET_ITALIC;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_ITALIC;
+			$this->_flags|=self::IS_ITALIC;
 		else
-			$this->_flags &= ~self::IS_ITALIC;
+			$this->_flags&=~self::IS_ITALIC;
 	}
 
 	/**
@@ -123,11 +123,11 @@ 
 	 */
 	public function setOverline($value)
 	{
-		$this->_flags |= self::IS_SET_OVERLINE;
+		$this->_flags|=self::IS_SET_OVERLINE;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_OVERLINE;
+			$this->_flags|=self::IS_OVERLINE;
 		else
-			$this->_flags &= ~self::IS_OVERLINE;
+			$this->_flags&=~self::IS_OVERLINE;
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setSize($value)
 	{
-		$this->_flags |= self::IS_SET_SIZE;
+		$this->_flags|=self::IS_SET_SIZE;
 		$this->_size=$value;
 	}
 
@@ -160,11 +160,11 @@ 
 	 */
 	public function setStrikeout($value)
 	{
-		$this->_flags |= self::IS_SET_STRIKEOUT;
+		$this->_flags|=self::IS_SET_STRIKEOUT;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_STRIKEOUT;
+			$this->_flags|=self::IS_STRIKEOUT;
 		else
-			$this->_flags &= ~self::IS_STRIKEOUT;
+			$this->_flags&=~self::IS_STRIKEOUT;
 	}
 
 	/**
@@ -180,11 +180,11 @@ 
 	 */
 	public function setUnderline($value)
 	{
-		$this->_flags |= self::IS_SET_UNDERLINE;
+		$this->_flags|=self::IS_SET_UNDERLINE;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_UNDERLINE;
+			$this->_flags|=self::IS_UNDERLINE;
 		else
-			$this->_flags &= ~self::IS_UNDERLINE;
+			$this->_flags&=~self::IS_UNDERLINE;
 	}
 
 	/**
@@ -200,7 +200,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->_flags |= self::IS_SET_NAME;
+		$this->_flags|=self::IS_SET_NAME;
 		$this->_name=$value;
 	}
 
@@ -283,9 +283,9 @@ 
 			return '';
 		$str='';
 		if($this->_flags & self::IS_SET_BOLD)
-			$str.='font-weight:'.(($this->_flags & self::IS_BOLD)?'bold;':'normal;');
+			$str.='font-weight:'.(($this->_flags & self::IS_BOLD) ? 'bold;' : 'normal;');
 		if($this->_flags & self::IS_SET_ITALIC)
-			$str.='font-style:'.(($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+			$str.='font-style:'.(($this->_flags & self::IS_ITALIC) ? 'italic;' : 'normal;');
 		$textDec='';
 		if($this->_flags & self::IS_UNDERLINE)
 			$textDec.='underline';
@@ -312,9 +312,9 @@ 
 		if($this->_flags===0)
 			return;
 		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight',(($this->_flags & self::IS_BOLD)?'bold':'normal'));
+			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD) ? 'bold' : 'normal'));
 		if($this->_flags & self::IS_SET_ITALIC)
-			$writer->addStyleAttribute('font-style',(($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC) ? 'italic' : 'normal'));
 		$textDec='';
 		if($this->_flags & self::IS_UNDERLINE)
 			$textDec.='underline';
@@ -324,10 +324,10 @@ 
 			$textDec.=' line-through';
 		$textDec=ltrim($textDec);
 		if($textDec!=='')
-			$writer->addStyleAttribute('text-decoration',$textDec);
+			$writer->addStyleAttribute('text-decoration', $textDec);
 		if($this->_size!=='')
-			$writer->addStyleAttribute('font-size',$this->_size);
+			$writer->addStyleAttribute('font-size', $this->_size);
 		if($this->_name!=='')
-			$writer->addStyleAttribute('font-family',$this->_name);
+			$writer->addStyleAttribute('font-family', $this->_name);
 	}
 }

framework/Web/UI/WebControls/TMultiView.php

Spacing +27 added lines, -27 removed lines

@@ -73,10 +73,10 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		if($this->_cachedActiveViewIndex>-1)
+		if($this->_cachedActiveViewIndex > -1)
 			return $this->_cachedActiveViewIndex;
 		else
-			return $this->getControlState('ActiveViewIndex',-1);
+			return $this->getControlState('ActiveViewIndex', -1);
 	}
 
 	/**
@@ -85,21 +85,21 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		if(($index=TPropertyValue::ensureInteger($value))<0)
+		if(($index=TPropertyValue::ensureInteger($value)) < 0)
 			$index=-1;
 		$views=$this->getViews();
 		$count=$views->getCount();
-		if($count===0 && $this->getControlStage()<TControl::CS_CHILD_INITIALIZED)
+		if($count===0 && $this->getControlStage() < TControl::CS_CHILD_INITIALIZED)
 			$this->_cachedActiveViewIndex=$index;
-		else if($index<$count)
+		else if($index < $count)
 		{
-			$this->setControlState('ActiveViewIndex',$index,-1);
+			$this->setControlState('ActiveViewIndex', $index, -1);
 			$this->_cachedActiveViewIndex=-1;
-			if($index>=0)
-				$this->activateView($views->itemAt($index),true);
+			if($index >= 0)
+				$this->activateView($views->itemAt($index), true);
 		}
 		else
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
+			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
 	}
 
 	/**
@@ -110,13 +110,13 @@ 
 	{
 		$index=$this->getActiveViewIndex();
 		$views=$this->getViews();
-		if($index>=$views->getCount())
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
-		if($index<0)
+		if($index >= $views->getCount())
+			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
+		if($index < 0)
 			return null;
 		$view=$views->itemAt($index);
 		if(!$view->getActive())
-			$this->activateView($view,false);
+			$this->activateView($view, false);
 		return $view;
 	}
 
@@ -126,7 +126,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if(($index=$this->getViews()->indexOf($view))>=0)
+		if(($index=$this->getViews()->indexOf($view)) >= 0)
 			$this->setActiveViewIndex($index);
 		else
 			throw new TInvalidOperationException('multiview_view_inexistent');
@@ -138,11 +138,11 @@ 
 	 * @param TView the view to be activated
 	 * @param boolean whether to trigger OnActiveViewChanged event.
 	 */
-	protected function activateView($view,$triggerViewChangedEvent=true)
+	protected function activateView($view, $triggerViewChangedEvent=true)
 	{
 		if($view->getActive())
 			return;
-		$triggerEvent=$triggerViewChangedEvent && ($this->getControlStage()>=TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
+		$triggerEvent=$triggerViewChangedEvent && ($this->getControlStage() >= TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
 		foreach($this->getViews() as $v)
 		{
 			if($v===$view)
@@ -189,7 +189,7 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if($this->_cachedActiveViewIndex>=0)
+		if($this->_cachedActiveViewIndex >= 0)
 			$this->setActiveViewIndex($this->_cachedActiveViewIndex);
 	}
 
@@ -200,7 +200,7 @@ 
 	 */
 	public function onActiveViewChanged($param)
 	{
-		$this->raiseEvent('OnActiveViewChanged',$this,$param);
+		$this->raiseEvent('OnActiveViewChanged', $this, $param);
 	}
 
 	/**
@@ -210,21 +210,21 @@ 
 	 * @param mixed event parameter
 	 * @return boolean whether this event is handled
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if(!$this->_ignoreBubbleEvents && ($param instanceof TCommandEventParameter))
 		{
 			switch($param->getCommandName())
 			{
 				case self::CMD_NEXTVIEW:
-					if(($index=$this->getActiveViewIndex())<$this->getViews()->getCount()-1)
-						$this->setActiveViewIndex($index+1);
+					if(($index=$this->getActiveViewIndex()) < $this->getViews()->getCount() - 1)
+						$this->setActiveViewIndex($index + 1);
 					else
 						$this->setActiveViewIndex(-1);
 					return true;
 				case self::CMD_PREVIOUSVIEW:
-					if(($index=$this->getActiveViewIndex())>=0)
-						$this->setActiveViewIndex($index-1);
+					if(($index=$this->getActiveViewIndex()) >= 0)
+						$this->setActiveViewIndex($index - 1);
 					return true;
 				case self::CMD_SWITCHVIEWID:
 					$view=$this->findControl($viewID=$param->getCommandParameter());
@@ -283,10 +283,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is neither a string nor a TControl.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TView)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('viewcollection_view_required');
 	}
@@ -317,7 +317,7 @@ 
 	 */
 	public function onActivate($param)
 	{
-		$this->raiseEvent('OnActivate',$this,$param);
+		$this->raiseEvent('OnActivate', $this, $param);
 	}
 
 	/**
@@ -326,7 +326,7 @@ 
 	 */
 	public function onDeactivate($param)
 	{
-		$this->raiseEvent('OnDeactivate',$this,$param);
+		$this->raiseEvent('OnDeactivate', $this, $param);
 	}
 
 	/**

framework/Web/UI/WebControls/TImageButton.php

Spacing +29 added lines, -29 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -99,16 +99,16 @@ 
 	{
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
-		$writer->addAttribute('type','image');
+		$writer->addAttribute('type', 'image');
 		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
+			$writer->addAttribute('name', $uniqueID);
 		if($this->getEnabled(true))
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
 		}
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -117,9 +117,9 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 		if($this->getCausesValidation())
 		{
 			$group=$this->getValidationGroup();
-			return $this->getPage()->getValidators($group)->getCount()>0;
+			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
 			return false;
@@ -151,7 +151,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -177,10 +177,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['EventTarget']=$this->getUniqueID();
 
 		return $options;
 	}
@@ -192,7 +192,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		$uid=$this->getUniqueID();
 		if(isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
@@ -223,7 +223,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -235,8 +235,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 
 	/**
@@ -252,8 +252,8 @@ 
 	{
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TImageClickEventParameter($this->_x,$this->_y));
-		$this->onCommand(new TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
+		$this->onCommand(new TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -319,7 +319,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -397,7 +397,7 @@ 
 	 * @param integer X coordinate of the clicking point
 	 * @param integer Y coordinate of the clicking point
 	 */
-	public function __construct($x,$y)
+	public function __construct($x, $y)
 	{
 		$this->_x=$x;
 		$this->_y=$y;

framework/Web/UI/WebControls/TConditional.php

Spacing +3 added lines, -3 removed lines

@@ -76,15 +76,15 @@
 		}
 		catch(Exception $e)
 		{
-			throw new TInvalidDataValueException('conditional_condition_invalid',$this->_condition,$e->getMessage());
+			throw new TInvalidDataValueException('conditional_condition_invalid', $this->_condition, $e->getMessage());
 		}
 		if($result)
 		{
 			if($this->_trueTemplate)
-				$this->_trueTemplate->instantiateIn($this->getTemplateControl(),$this);
+				$this->_trueTemplate->instantiateIn($this->getTemplateControl(), $this);
 		}
 		else if($this->_falseTemplate)
-			$this->_falseTemplate->instantiateIn($this->getTemplateControl(),$this);
+			$this->_falseTemplate->instantiateIn($this->getTemplateControl(), $this);
 		$this->_creatingChildren=false;
 	}
 

framework/Web/UI/WebControls/THiddenField.php

Spacing +9 added lines, -9 removed lines

@@ -53,18 +53,18 @@ 
 	{
 		$uniqueID=$this->getUniqueID();
 		$this->getPage()->ensureRenderInForm($this);
-		$writer->addAttribute('type','hidden');
+		$writer->addAttribute('type', 'hidden');
 		if($uniqueID!=='')
-			$writer->addAttribute('name',$uniqueID);
+			$writer->addAttribute('name', $uniqueID);
 		if($this->getID()!=='')
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 		if(($value=$this->getValue())!=='')
-			$writer->addAttribute('value',$value);
+			$writer->addAttribute('value', $value);
 
 		if($this->getHasAttributes())
 		{
 			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+				$writer->addAttribute($name, $value);
 		}
 
 		$writer->renderBeginTag('input');
@@ -78,7 +78,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		$value=$values[$key];
 		if($value===$this->getValue())
@@ -146,7 +146,7 @@ 
 	 */
 	public function onValueChanged($param)
 	{
-		$this->raiseEvent('OnValueChanged',$this,$param);
+		$this->raiseEvent('OnValueChanged', $this, $param);
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->getViewState('Value','');
+		return $this->getViewState('Value', '');
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',$value,'');
+		$this->setViewState('Value', $value, '');
 	}
 
 	/**