pradosoft / prado

framework/Web/UI/JuiControls/TJuiControlOptions.php

Spacing +19 added lines, -19 removed lines

@@ -72,7 +72,7 @@ 
 	public function setControl($control)
 	{
 	  if(!$control instanceof IJuiOptions)
-	    throw new THttpException(500,'juioptions_control_invalid',$control->ID);
+	    throw new THttpException(500, 'juioptions_control_invalid', $control->ID);
 	  $this->_control=$control;
 	}
 
@@ -83,36 +83,36 @@ 
 	 * @param mixed option value.
 	 * @throws THttpException
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
 		if($this->_options===null)
 			$this->_options=array();
 
 		foreach($this->_control->getValidOptions() as $option)
 		{
-			if(0 == strcasecmp($name, $option))
+			if(0==strcasecmp($name, $option))
 			{
-				$low = strtolower($value);
-				if($low === 'null')
+				$low=strtolower($value);
+				if($low==='null')
 				{
-					$this->_options[$option] = null;
-				} elseif($low === 'true') {
-					$this->_options[$option] = true;
-				} elseif($low === 'false') {
-					$this->_options[$option] = false;
+					$this->_options[$option]=null;
+				} elseif($low==='true') {
+					$this->_options[$option]=true;
+				} elseif($low==='false') {
+					$this->_options[$option]=false;
 				} elseif(is_numeric($value)) {
 					// trick to get float or integer automatically when needed
-					$this->_options[$option] = $value + 0;
-				} elseif(substr($low,0,8)=='function') {
-					$this->_options[$option] = new TJavaScriptLiteral($value);
+					$this->_options[$option]=$value + 0;
+				} elseif(substr($low, 0, 8)=='function') {
+					$this->_options[$option]=new TJavaScriptLiteral($value);
 				} else {
-					$this->_options[$option] = $value;
+					$this->_options[$option]=$value;
 				}
 				return;
 			}
 		}
 
-		throw new TConfigurationException('juioptions_option_invalid',$this->_control->ID, $name);
+		throw new TConfigurationException('juioptions_option_invalid', $this->_control->ID, $name);
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 
 		foreach($this->_control->getValidOptions() as $option)
 		{
-			if(0 == strcasecmp($name, $option) && isset($this->_options[$option]))
+			if(0==strcasecmp($name, $option) && isset($this->_options[$option]))
 			{
 				return $this->_options[$option];
 			}
@@ -150,7 +150,7 @@ 
 	 */
 	public function toArray()
 	{
-		$ret= ($this->_options===null) ? array() : $this->_options;
+		$ret=($this->_options===null) ? array() : $this->_options;
 
 		foreach($this->_control->getValidEvents() as $event)
 			if($this->_control->hasEventHandler('on'.$event))
@@ -168,10 +168,10 @@ 
 		$callbackParam=$param->CallbackParameter;
 		if(isset($callbackParam->event))
 		{
-			$eventName = 'On'.ucfirst($callbackParam->event);
+			$eventName='On'.ucfirst($callbackParam->event);
 			if($this->_control->hasEventHandler($eventName))
 			{
-				$this->_control->$eventName( new TJuiEventParameter(
+				$this->_control->$eventName(new TJuiEventParameter(
 					$this->_control->getResponse(),
 					isset($callbackParam->ui) ? $callbackParam->ui : null)
 				);

framework/Web/UI/JuiControls/TJuiControlAdapter.php

Spacing +13 added lines, -13 removed lines

@@ -25,9 +25,9 @@ 
  */
 class TJuiControlAdapter extends TActiveControlAdapter
 {
-	const SCRIPT_PATH = 'jquery';
-	const CSS_PATH = 'css';
-	const BASE_CSS_FILENAME ='jquery-ui.css';
+	const SCRIPT_PATH='jquery';
+	const CSS_PATH='css';
+	const BASE_CSS_FILENAME='jquery-ui.css';
 
 	/**
 	 * Replace default StateTracker with {@link TJuiCallbackPageStateTracker} for
@@ -72,7 +72,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
@@ -83,8 +83,8 @@ 
 	 */
 	public function publishJuiStyle($file)
 	{
-		$url = $this->getAssetUrl(self::CSS_PATH.'/'.$this->getJuiBaseStyle().'/'.$file);
-		$cs = $this->getPage()->getClientScript();
+		$url=$this->getAssetUrl(self::CSS_PATH.'/'.$this->getJuiBaseStyle().'/'.$file);
+		$cs=$this->getPage()->getClientScript();
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
@@ -139,11 +139,11 @@ 
 	{
 		$control=null;
 		$service=prado::getApplication()->getService();
-		if ($service instanceof TPageService)
+		if($service instanceof TPageService)
 		{
 			// Find the control
 			// Warning, this will not work if you have a '_' in your control Id !
-			$controlId=str_replace(TControl::CLIENT_ID_SEPARATOR,TControl::ID_SEPARATOR,$id);
+			$controlId=str_replace(TControl::CLIENT_ID_SEPARATOR, TControl::ID_SEPARATOR, $id);
 			$control=$service->getRequestedPage()->findControl($controlId);
 		}
 		return $control;
@@ -157,7 +157,7 @@ 
 	 */
 	public function __get($name)
 	{
-		$pos=strpos($name, 'Control',1);
+		$pos=strpos($name, 'Control', 1);
 		$name=strtolower(substr($name, 0, $pos));
 
 		$cp=$this->getCallbackParameter();
@@ -185,8 +185,8 @@ 
   protected function addStatesToTrack()
   {
     parent::addStatesToTrack();
-    $states = $this->getStatesToTrack();
-    $states['JuiOptions'] = array('TMapCollectionDiff', array($this, 'updateJuiOptions'));
+    $states=$this->getStatesToTrack();
+    $states['JuiOptions']=array('TMapCollectionDiff', array($this, 'updateJuiOptions'));
   }
 
 	/**
@@ -195,8 +195,8 @@ 
 	 */
   protected function updateJuiOptions($options)
   {
-    foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
-    $code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });";
+    foreach($options as $key => $value) $options[$key]=$key.': '.(is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+    $code="jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { ".implode(', ', $options)." });";
     $this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code);
   }
 

framework/Web/UI/JuiControls/TJuiDroppable.php

Spacing +8 added lines, -8 removed lines

@@ -92,7 +92,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -134,7 +134,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$cs=$this->getPage()->getClientScript();
 		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
@@ -155,7 +155,7 @@ 
 	 * Raises the OnActivate event
 	 * @param object $params event parameters
 	 */
-	public function onActivate ($params)
+	public function onActivate($params)
 	{
 		$this->raiseEvent('OnActivate', $this, $params);
 	}
@@ -164,7 +164,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onCreate ($params)
+	public function onCreate($params)
 	{
 		$this->raiseEvent('OnCreate', $this, $params);
 	}
@@ -173,7 +173,7 @@ 
 	 * Raises the OnDeactivate event
 	 * @param object $params event parameters
 	 */
-	public function onDeactivate ($params)
+	public function onDeactivate($params)
 	{
 		$this->raiseEvent('OnDeactivate', $this, $params);
 	}
@@ -182,7 +182,7 @@ 
 	 * Raises the OnDrop event
 	 * @param object $params event parameters
 	 */
-	public function onDrop ($params)
+	public function onDrop($params)
 	{
 		$this->raiseEvent('OnDrop', $this, $params);
 	}
@@ -191,7 +191,7 @@ 
 	 * Raises the OnOut event
 	 * @param object $params event parameters
 	 */
-	public function OnOut ($params)
+	public function OnOut($params)
 	{
 		$this->raiseEvent('OnOut', $this, $params);
 	}
@@ -200,7 +200,7 @@ 
 	 * Raises the OnOver event
 	 * @param object $params event parameters
 	 */
-	public function OnOver ($params)
+	public function OnOver($params)
 	{
 		$this->raiseEvent('OnOver', $this, $params);
 	}

framework/Web/UI/JuiControls/TJuiProgressbar.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -110,7 +110,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$cs=$this->getPage()->getClientScript();
 		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";

framework/Web/UI/JuiControls/TJuiSortable.php

Spacing +21 added lines, -21 removed lines

@@ -62,7 +62,7 @@ 
 	 */
 	public function getWidgetID()
 	{
-	  return $this->getClientID() . '_0';
+	  return $this->getClientID().'_0';
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -102,7 +102,7 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = $this->getOptions()->toArray();
+		$options=$this->getOptions()->toArray();
 		// overload some events to add information about the items order
 		foreach($options as $event => $implementation)
 		{
@@ -119,7 +119,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$cs=$this->getPage()->getClientScript();
 		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
@@ -140,7 +140,7 @@ 
 	 * Raises the OnActivate event
 	 * @param object $params event parameters
 	 */
-	public function onActivate ($params)
+	public function onActivate($params)
 	{
 		$this->raiseEvent('OnActivate', $this, $params);
 	}
@@ -149,7 +149,7 @@ 
 	 * Raises the OnBeforeStop event
 	 * @param object $params event parameters
 	 */
-	public function onBeforeStop ($params)
+	public function onBeforeStop($params)
 	{
 		$this->raiseEvent('OnBeforeStop', $this, $params);
 	}
@@ -158,7 +158,7 @@ 
 	 * Raises the OnChange event
 	 * @param object $params event parameters
 	 */
-	public function onChange ($params)
+	public function onChange($params)
 	{
 		$this->raiseEvent('OnChange', $this, $params);
 	}
@@ -167,7 +167,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onCreate ($params)
+	public function onCreate($params)
 	{
 		$this->raiseEvent('OnCreate', $this, $params);
 	}
@@ -176,7 +176,7 @@ 
 	 * Raises the OnDeactivate event
 	 * @param object $params event parameters
 	 */
-	public function onDeactivate ($params)
+	public function onDeactivate($params)
 	{
 		$this->raiseEvent('OnDeactivate', $this, $params);
 	}
@@ -185,7 +185,7 @@ 
 	 * Raises the OnOut event
 	 * @param object $params event parameters
 	 */
-	public function onOut ($params)
+	public function onOut($params)
 	{
 		$this->raiseEvent('OnOut', $this, $params);
 	}
@@ -194,7 +194,7 @@ 
 	 * Raises the OnOver event
 	 * @param object $params event parameters
 	 */
-	public function onOver ($params)
+	public function onOver($params)
 	{
 		$this->raiseEvent('OnOver', $this, $params);
 	}
@@ -203,7 +203,7 @@ 
 	 * Raises the OnReceive event
 	 * @param object $params event parameters
 	 */
-	public function onReceive ($params)
+	public function onReceive($params)
 	{
 		$this->raiseEvent('OnReceive', $this, $params);
 	}
@@ -212,7 +212,7 @@ 
 	 * Raises the OnRemove event
 	 * @param object $params event parameters
 	 */
-	public function onRemove ($params)
+	public function onRemove($params)
 	{
 		$this->raiseEvent('OnRemove', $this, $params);
 	}
@@ -221,7 +221,7 @@ 
 	 * Raises the OnSort event
 	 * @param object $params event parameters
 	 */
-	public function onSort ($params)
+	public function onSort($params)
 	{
 		$this->raiseEvent('OnSort', $this, $params);
 	}
@@ -230,7 +230,7 @@ 
 	 * Raises the OnStart event
 	 * @param object $params event parameters
 	 */
-	public function onStart ($params)
+	public function onStart($params)
 	{
 		$this->raiseEvent('OnStart', $this, $params);
 	}
@@ -239,7 +239,7 @@ 
 	 * Raises the OnStop event
 	 * @param object $params event parameters
 	 */
-	public function OnStop ($params)
+	public function OnStop($params)
 	{
 		$this->raiseEvent('OnStop', $this, $params);
 	}
@@ -248,7 +248,7 @@ 
 	 * Raises the OnUpdate event
 	 * @param object $params event parameters
 	 */
-	public function onUpdate ($params)
+	public function onUpdate($params)
 	{
 		$this->raiseEvent('OnUpdate', $this, $params);
 	}
@@ -283,7 +283,7 @@ 
 	public function getSortables()
 	{
 		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+			$this->_repeater=$this->createRepeater();
 		return $this->_repeater;
 	}
 
@@ -292,10 +292,10 @@ 
 	 */
 	protected function createRepeater()
 	{
-		$repeater = Prado::createComponent('System.Web.UI.WebControls.TRepeater');
+		$repeater=Prado::createComponent('System.Web.UI.WebControls.TRepeater');
 		$repeater->setHeaderTemplate(new TJuiSortableTemplate('<ul id="'.$this->getWidgetID().'">'));
 		$repeater->setFooterTemplate(new TJuiSortableTemplate('</ul>'));
-		$repeater->setItemTemplate(new TTemplate('<li id="<%# $this->ItemIndex %>"><%# $this->Data %></li>',null));
+		$repeater->setItemTemplate(new TTemplate('<li id="<%# $this->ItemIndex %>"><%# $this->Data %></li>', null));
 		$repeater->setEmptyTemplate(new TJuiSortableTemplate('<ul></ul>'));
 		$this->getControls()->add($repeater);
 		return $repeater;
@@ -319,7 +319,7 @@ 
 
 	public function __construct($template)
 	{
-		$this->_template = $template;
+		$this->_template=$template;
 	}
 	/**
 	 * Instantiates the template.

framework/Web/UI/JuiControls/TJuiAutoComplete.php

Spacing +31 added lines, -31 removed lines

@@ -123,7 +123,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -204,7 +204,7 @@ 
 	 */
 	public function getMinChars()
 	{
-		return $this->getViewState('minChars','');
+		return $this->getViewState('minChars', '');
 	}
 
 	/**
@@ -228,17 +228,17 @@ 
 	 */
  	public function raiseCallbackEvent($param)
 	{
-		$token = $param->getCallbackParameter();
-		if(is_array($token) && count($token) == 2)
+		$token=$param->getCallbackParameter();
+		if(is_array($token) && count($token)==2)
 		{
-			if($token[1] === '__TJuiAutoComplete_onSuggest__')
+			if($token[1]==='__TJuiAutoComplete_onSuggest__')
 			{
-				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
+				$parameter=new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
 			}
-			else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			else if($token[1]==='__TJuiAutoComplete_onSuggestionSelected__')
 			{
-				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
+				$parameter=new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
 		}
@@ -295,7 +295,7 @@ 
 	public function getResultPanel()
 	{
 		if($this->_resultPanel===null)
-			$this->_resultPanel = $this->createResultPanel();
+			$this->_resultPanel=$this->createResultPanel();
 		return $this->_resultPanel;
 	}
 
@@ -304,7 +304,7 @@ 
 	 */
 	protected function createResultPanel()
 	{
-		$panel = Prado::createComponent('System.Web.UI.WebControls.TPanel');
+		$panel=Prado::createComponent('System.Web.UI.WebControls.TPanel');
 		$this->getControls()->add($panel);
 		$panel->setID('result');
 		return $panel;
@@ -316,7 +316,7 @@ 
 	public function getSuggestions()
 	{
 		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+			$this->_repeater=$this->createRepeater();
 		return $this->_repeater;
 	}
 
@@ -325,8 +325,8 @@ 
 	 */
 	protected function createRepeater()
 	{
-		$repeater = Prado::createComponent('System.Web.UI.WebControls.TRepeater');
-		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>',null));
+		$repeater=Prado::createComponent('System.Web.UI.WebControls.TRepeater');
+		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>', null));
 		$this->getControls()->add($repeater);
 		return $repeater;
 	}
@@ -368,12 +368,12 @@ 
 		{
 			$data=array();
 			$items=$this->getSuggestions()->getItems();
-			$writer = new TTextWriter;
-			for($i=0; $i<$items->Count; $i++)
+			$writer=new TTextWriter;
+			for($i=0; $i < $items->Count; $i++)
 			{
 				$items->itemAt($i)->render($writer);
 				$item=$writer->flush();
-				$data[]=array( 'id' => $i, 'label' => $item);
+				$data[]=array('id' => $i, 'label' => $item);
 			}
 
 			$this->getResponse()->getAdapter()->setResponseData($data);
@@ -385,25 +385,25 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = $this->getOptions()->toArray();
+		$options=$this->getOptions()->toArray();
 
-		if(strlen($separator = $this->getSeparator()))
-			$options['Separators'] = $separator;
+		if(strlen($separator=$this->getSeparator()))
+			$options['Separators']=$separator;
 
 		if($this->getAutoPostBack())
 		{
-			$options = array_merge($options,parent::getPostBackOptions());
-			$options['AutoPostBack'] = true;
+			$options=array_merge($options, parent::getPostBackOptions());
+			$options['AutoPostBack']=true;
 		}
-		if(strlen($textCssClass = $this->getTextCssClass()))
-			$options['textCssClass'] = $textCssClass;
-		$options['minLength'] = $this->getMinChars();
-		$options['delay'] = $this->getFrequency()*1000.0;
-		$options['appendTo'] = '#'.$this->getResultPanel()->getClientID();
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
+		if(strlen($textCssClass=$this->getTextCssClass()))
+			$options['textCssClass']=$textCssClass;
+		$options['minLength']=$this->getMinChars();
+		$options['delay']=$this->getFrequency() * 1000.0;
+		$options['appendTo']='#'.$this->getResultPanel()->getClientID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
 		return $options;
 	}
 
@@ -481,7 +481,7 @@ 
 
 	public function __construct($template)
 	{
-		$this->_template = $template;
+		$this->_template=$template;
 	}
 	/**
 	 * Instantiates the template.

framework/Web/UI/TTemplateControlInheritable.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
 	 */	
 	public function createChildControls()
 	{
-		if(null === ($_template = $this->getTemplate())) {
+		if(null===($_template=$this->getTemplate())) {
 			return $this->doCreateChildControlsFor(get_class($this));
 		}
 
@@ -66,7 +66,7 @@ 
 	 */
 	public function doCreateChildControlsFor($parentClass)
 	{
-		if(false !== ($_parentClass = get_parent_class($parentClass)) && 'TTemplateControl' != $_parentClass) {
+		if(false!==($_parentClass=get_parent_class($parentClass)) && 'TTemplateControl'!=$_parentClass) {
 			$this->doCreateChildControlsFor($_parentClass);
 		}
 
@@ -82,7 +82,7 @@ 
 	 */
 	public function doTemplateForClass($parentClass)
 	{
-		if(null !== ($_template = $this->getService()->getTemplateManager()->getTemplateByClassName($parentClass))) {
+		if(null!==($_template=$this->getService()->getTemplateManager()->getTemplateByClassName($parentClass))) {
 			foreach($_template->getDirective() as $_name => $_value) {
 				if(!is_string($_value)) {
 					throw new TConfigurationException('templatecontrol_directive_invalid', get_class(this), $_name);
@@ -105,11 +105,11 @@ 
 	 */
 	public function getIsSourceTemplateControl()
 	{
-		if(null !== ($_template = $this->getTemplate())) {
+		if(null!==($_template=$this->getTemplate())) {
 			return $_template->getIsSourceTemplate();
 		}
 
-		return ($_template = $this->getService()->getTemplateManager()->getTemplateByClassName(get_parent_class($this)))
+		return ($_template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_parent_class($this)))
 			? $_template->getIsSourceTemplate()
 			: false;
 	}

framework/Web/UI/TPageStatePersister.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function save($state)
 	{
-		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page,$state));
+		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page, $state));
 	}
 
 	/**
@@ -60,10 +60,10 @@ 
 	 */
 	public function load()
 	{
-		if(($data=TPageStateFormatter::unserialize($this->_page,$this->_page->getRequestClientState()))!==null)
+		if(($data=TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState()))!==null)
 			return $data;
 		else
-			throw new THttpException(400,'pagestatepersister_pagestate_corrupted');
+			throw new THttpException(400, 'pagestatepersister_pagestate_corrupted');
 	}
 }
 

framework/Web/TUrlMapping.php

Spacing +68 added lines, -68 removed lines

@@ -116,7 +116,7 @@ 
 				$this->_urlPrefix=$request->getApplicationUrl();
 			}
 		}
-		$this->_urlPrefix=rtrim($this->_urlPrefix,'/');
+		$this->_urlPrefix=rtrim($this->_urlPrefix, '/');
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
-				$config = include $this->_configFile;
+				$config=include $this->_configFile;
 				$this->loadUrlMappings($dom);
 			}
 			else
@@ -140,7 +140,7 @@ 
 			}
 		}
 		else
-			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
+			throw new TConfigurationException('urlmapping_configfile_inexistent', $this->_configFile);
 	}
 
 	/**
@@ -201,8 +201,8 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,$this->getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('urlmapping_configfile_invalid',$value);
+		if(($this->_configFile=Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt()))===null)
+			throw new TConfigurationException('urlmapping_configfile_invalid', $value);
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 */
 	protected function loadUrlMappings($config)
 	{
-		$defaultClass = $this->getDefaultMappingClass();
+		$defaultClass=$this->getDefaultMappingClass();
 
 		if(is_array($config))
 		{
@@ -241,9 +241,9 @@ 
 			{
 				foreach($config['urls'] as $url)
 				{
-					$class=isset($url['class'])?$url['class']:$defaultClass;
-					$properties = isset($url['properties'])?$url['properties']:array();
-					$this->buildUrlMapping($class,$properties,$url);
+					$class=isset($url['class']) ? $url['class'] : $defaultClass;
+					$properties=isset($url['properties']) ? $url['properties'] : array();
+					$this->buildUrlMapping($class, $properties, $url);
 				}
 			}
 		}
@@ -254,24 +254,24 @@ 
 				$properties=$url->getAttributes();
 				if(($class=$properties->remove('class'))===null)
 					$class=$defaultClass;
-				$this->buildUrlMapping($class,$properties,$url);
+				$this->buildUrlMapping($class, $properties, $url);
 			}
 		}
 	}
 
 	private function buildUrlMapping($class, $properties, $url)
 	{
-		$pattern=Prado::createComponent($class,$this);
+		$pattern=Prado::createComponent($class, $this);
 		if(!($pattern instanceof TUrlMappingPattern))
 			throw new TConfigurationException('urlmapping_urlmappingpattern_required');
 		foreach($properties as $name=>$value)
-			$pattern->setSubproperty($name,$value);
+			$pattern->setSubproperty($name, $value);
 
 		if($url instanceof TXmlElement) {
-			$text = $url -> getValue();
+			$text=$url -> getValue();
 			if($text) {
-				$text = preg_replace('/(\s+)/S', '', $text);
-				if(($regExp = $pattern->getRegularExpression()) !== '')
+				$text=preg_replace('/(\s+)/S', '', $text);
+				if(($regExp=$pattern->getRegularExpression())!=='')
 				trigger_error(sPrintF('%s.RegularExpression property value "%s" for ServiceID="%s" and ServiceParameter="%s" was replaced by node value "%s"',
 				get_class($pattern),
 				$regExp,
@@ -304,7 +304,7 @@ 
 		foreach($this->_patterns as $pattern)
 		{
 			$matches=$pattern->getPatternMatches($request);
-			if(count($matches)>0)
+			if(count($matches) > 0)
 			{
 				$this->_matched=$pattern;
 				$params=array();
@@ -313,7 +313,7 @@ 
 					if(is_string($key))
 						$params[$key]=$value;
 				}
-				if (!$pattern->getIsWildCardPattern())
+				if(!$pattern->getIsWildCardPattern())
 					$params[$pattern->getServiceID()]=$pattern->getServiceParameter();
 				return $params;
 			}
@@ -345,21 +345,21 @@ 
 	 * @see parseUrl
 	 * @since 3.1.1
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		if($this->_customUrl)
 		{
 			if(!(is_array($getItems) || ($getItems instanceof Traversable)))
 				$getItems=array();
 			$key=$serviceID.':'.$serviceParam;
-			$wildCardKey = ($pos=strrpos($serviceParam,'.'))!==false ?
-				$serviceID.':'.substr($serviceParam,0,$pos).'.*' : $serviceID.':*';
+			$wildCardKey=($pos=strrpos($serviceParam, '.'))!==false ?
+				$serviceID.':'.substr($serviceParam, 0, $pos).'.*' : $serviceID.':*';
 			if(isset($this->_constructRules[$key]))
 			{
 				foreach($this->_constructRules[$key] as $rule)
 				{
 					if($rule->supportCustomUrl($getItems))
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 				}
 			}
 			elseif(isset($this->_constructRules[$wildCardKey]))
@@ -368,13 +368,13 @@ 
 				{
 					if($rule->supportCustomUrl($getItems))
 					{
-						$getItems['*']= $pos ? substr($serviceParam,$pos+1) : $serviceParam;
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+						$getItems['*']=$pos ? substr($serviceParam, $pos + 1) : $serviceParam;
+						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 					}
 				}
 			}
 		}
-		return parent::constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
+		return parent::constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
 	}
 
 	/**
@@ -528,7 +528,7 @@ 
 	 * @var TUrlMappingPatternSecureConnection
 	 * @since 3.2
 	 */
-	private $_secureConnection = TUrlMappingPatternSecureConnection::Automatic;
+	private $_secureConnection=TUrlMappingPatternSecureConnection::Automatic;
 
 	/**
 	 * Constructor.
@@ -556,7 +556,7 @@ 
 	{
 		if($this->_serviceParameter===null)
 			throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
-		if(strpos($this->_serviceParameter,'*')!==false)
+		if(strpos($this->_serviceParameter, '*')!==false)
 				$this->_isWildCardPattern=true;
 	}
 
@@ -569,7 +569,7 @@ 
 	{
 		$params=array();
 		$values=array();
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
@@ -577,7 +577,7 @@ 
 				$values[]='(?P<'.$key.'>'.$value.')';
 			}
 		}
-		if ($this->getIsWildCardPattern())
+		if($this->getIsWildCardPattern())
 		{
 				$params[]='{*}';
 				// service parameter must not contain '=' and '/'
@@ -585,8 +585,8 @@ 
 		}
 		$params[]='/';
 		$values[]='\\/';
-		$regexp=str_replace($params,$values,trim($this->getPattern(),'/').'/');
-		if ($this->_urlFormat===THttpRequestUrlFormat::Get)
+		$regexp=str_replace($params, $values, trim($this->getPattern(), '/').'/');
+		if($this->_urlFormat===THttpRequestUrlFormat::Get)
 				$regexp='/^'.$regexp.'$/u';
 		else
 				$regexp='/^'.$regexp.'(?P<urlparams>.*)$/u';
@@ -673,7 +673,7 @@ 
 	 */
 	public function setPattern($value)
 	{
-		$this->_pattern = $value;
+		$this->_pattern=$value;
 	}
 
 	/**
@@ -681,7 +681,7 @@ 
 	 */
 	public function getParameters()
 	{
-		if (!$this->_parameters)
+		if(!$this->_parameters)
 		{
 			$this->_parameters=new TAttributeCollection;
 			$this->_parameters->setCaseSensitive(true);
@@ -703,9 +703,9 @@ 
 	 */
 	public function getConstants()
 	{
-		if (!$this->_constants)
+		if(!$this->_constants)
 		{
-			$this->_constants = new TAttributeCollection;
+			$this->_constants=new TAttributeCollection;
 			$this->_constants->setCaseSensitive(true);
 		}
 		return $this->_constants;
@@ -721,17 +721,17 @@ 
 	{
 		$matches=array();
 		if(($pattern=$this->getRegularExpression())!=='')
-			preg_match($pattern,$request->getPathInfo(),$matches);
+			preg_match($pattern, $request->getPathInfo(), $matches);
 		else
-			preg_match($this->getParameterizedPattern(),trim($request->getPathInfo(),'/').'/',$matches);
+			preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/').'/', $matches);
 
 		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
-			$matches[$this->_serviceID]=str_replace('*',$matches[$this->_serviceID],$this->_serviceParameter);
+			$matches[$this->_serviceID]=str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
 
-		if (isset($matches['urlparams']))
+		if(isset($matches['urlparams']))
 		{
-			$params=explode('/',$matches['urlparams']);
-			if ($this->_separator==='/')
+			$params=explode('/', $matches['urlparams']);
+			if($this->_separator==='/')
 			{
 				while($key=array_shift($params))
 					$matches[$key]=($value=array_shift($params)) ? $value : '';
@@ -741,7 +741,7 @@ 
 				array_pop($params);
 				foreach($params as $param)
 				{
-					list($key,$value)=explode($this->_separator,$param,2);
+					list($key, $value)=explode($this->_separator, $param, 2);
 					$matches[$key]=$value;
 				}
 			}
@@ -751,7 +751,7 @@ 
 		if(count($matches) > 0 && $this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
-				$matches[$key] = $value;
+				$matches[$key]=$value;
 		}
 
 		return $matches;
@@ -805,7 +805,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 
 	/**
@@ -843,7 +843,7 @@ 
 	 */
 	public function setSecureConnection($value)
 	{
-		$this->_secureConnection = TPropertyValue::ensureEnum($value, 'TUrlMappingPatternSecureConnection');
+		$this->_secureConnection=TPropertyValue::ensureEnum($value, 'TUrlMappingPatternSecureConnection');
 	}
 
 	/**
@@ -855,7 +855,7 @@ 
 	{
 		if(!$this->_customUrl || $this->getPattern()===null)
 			return false;
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
@@ -864,13 +864,13 @@ 
 			}
 		}
 
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
 			{
-				if (!isset($getItems[$key]))
+				if(!isset($getItems[$key]))
 					return false;
-				if ($getItems[$key]!=$value)
+				if($getItems[$key]!=$value)
 					return false;
 			}
 		}
@@ -885,9 +885,9 @@ 
 	 * @return string the constructed URL
 	 * @since 3.1.1
 	 */
-	public function constructUrl($getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($getItems, $encodeAmpersand, $encodeGetItems)
 	{
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
 			{
@@ -906,19 +906,19 @@ 
 				$extra[$key]=$value;
 		}
 
-		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(),$replace),'/');
+		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(), $replace), '/');
 
 		// for the rest of the GET variables, put them in the query string
-		if(count($extra)>0)
+		if(count($extra) > 0)
 		{
-			if ($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
-				foreach ($extra as $name=>$value)
-					$url.='/'.$name.$this->_separator.($encodeGetItems?rawurlencode($value):$value);
+			if($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
+				foreach($extra as $name=>$value)
+					$url.='/'.$name.$this->_separator.($encodeGetItems ? rawurlencode($value) : $value);
 				return $url;
 			}
 
 			$url2='';
-			$amp=$encodeAmpersand?'&amp;':'&';
+			$amp=$encodeAmpersand ? '&amp;' : '&';
 			if($encodeGetItems)
 			{
 				foreach($extra as $name=>$value)
@@ -946,7 +946,7 @@ 
 						$url2.=$amp.$name.'='.$value;
 				}
 			}
-			$url=$url.'?'.substr($url2,strlen($amp));
+			$url=$url.'?'.substr($url2, strlen($amp));
 		}
 		return $this -> applySecureConnectionPrefix($url);
 	}
@@ -962,26 +962,26 @@ 
 	protected function applySecureConnectionPrefix($url)
 	{
 		static $request;
-		if($request === null) $request = Prado::getApplication() -> getRequest();
+		if($request===null) $request=Prado::getApplication() -> getRequest();
 
 		static $isSecureConnection;
-		if($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
+		if($isSecureConnection===null) $isSecureConnection=$request -> getIsSecureConnection();
 
 		switch($this -> getSecureConnection())
 		{
 			case TUrlMappingPatternSecureConnection::EnableIfNotSecure:
 				if($isSecureConnection) return $url;
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::DisableIfSecure:
 				if(!$isSecureConnection) return $url;
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Enable:
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Disable:
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Automatic:
 			default:
@@ -1007,29 +1007,29 @@ 
 	 * Keep current SecureConnection status
 	 * means no prefixing
 	 */
-	const Automatic = 'Automatic';
+	const Automatic='Automatic';
 
 	/**
 	 * Force use secured connection
 	 * always prefixing with https://example.com/path/to/app
 	 */
-	const Enable = 'Enable';
+	const Enable='Enable';
 
 	/**
 	 * Force use unsecured connection
 	 * always prefixing with http://example.com/path/to/app
 	 */
-	const Disable = 'Disable';
+	const Disable='Disable';
 
 	/**
 	 * Force use secured connection, if in unsecured mode
 	 * prefixing with https://example.com/path/to/app
 	 */
-	const EnableIfNotSecure = 'EnableIfNotSecure';
+	const EnableIfNotSecure='EnableIfNotSecure';
 
 	/**
 	 * Force use unsecured connection, if in secured mode
 	 * prefixing with https://example.com/path/to/app
 	 */
-	const DisableIfSecure = 'DisableIfSecure';
+	const DisableIfSecure='DisableIfSecure';
 }