pradosoft / prado

framework/Web/Javascripts/TJavaScript.php

Spacing +24 added lines, -24 removed lines

@@ -30,7 +30,7 @@ 
 	{
 		$str='';
 		foreach($files as $file)
-			$str.= self::renderScriptFile($file);
+			$str.=self::renderScriptFile($file);
 		return $str;
 	}
 
@@ -52,7 +52,7 @@ 
 	public static function renderScriptBlocks($scripts)
 	{
 		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n",$scripts)."\n/*]]>*/\n</script>\n";
+			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n", $scripts)."\n/*]]>*/\n</script>\n";
 		else
 			return '';
 	}
@@ -65,7 +65,7 @@ 
 	public static function renderScriptBlocksCallback($scripts)
 	{
 		if(count($scripts))
-			return implode("\n",$scripts)."\n";
+			return implode("\n", $scripts)."\n";
 		else
 			return '';
 	}
@@ -89,7 +89,7 @@ 
 	 */
 	public static function quoteString($js)
 	{
-		return self::jsonEncode($js,JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
+		return self::jsonEncode($js, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
 	}
 
 	/**
@@ -150,16 +150,16 @@ 
 	 * @param boolean wether to encode empty strings too. Default to false for BC.
 	 * @return string the encoded string
 	 */
-	public static function encode($value,$toMap=true,$encodeEmptyStrings=false)
+	public static function encode($value, $toMap=true, $encodeEmptyStrings=false)
 	{
 		if(is_string($value))
 			return self::quoteString($value);
 		else if(is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		else if(is_array($value))
 		{
 			$results='';
-			if(($n=count($value))>0 && array_keys($value)!==range(0,$n-1))
+			if(($n=count($value)) > 0 && array_keys($value)!==range(0, $n - 1))
 			{
 				foreach($value as $k=>$v)
 				{
@@ -167,7 +167,7 @@ 
 					{
 						if($results!=='')
 							$results.=',';
-						$results.="'$k':".self::encode($v,$toMap,$encodeEmptyStrings);
+						$results.="'$k':".self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
 				return '{'.$results.'}';
@@ -180,7 +180,7 @@ 
 					{
 						if($results!=='')
 							$results.=',';
-						$results.=self::encode($v,$toMap, $encodeEmptyStrings);
+						$results.=self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
 				return '['.$results.']';
@@ -208,10 +208,10 @@ 
 			}
 		}
 		else if(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+			if($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
-				return self::encode(get_object_vars($value),$toMap);
+				return self::encode(get_object_vars($value), $toMap);
 		else if($value===null)
 			return 'null';
 		else
@@ -223,14 +223,14 @@ 
 	 * @param mixed variable to be encoded
 	 * @return string encoded string
 	 */
-	public static function jsonEncode($value, $options = 0)
+	public static function jsonEncode($value, $options=0)
 	{
-		if (($g=Prado::getApplication()->getGlobalization(false))!==null &&
+		if(($g=Prado::getApplication()->getGlobalization(false))!==null &&
 			strtoupper($enc=$g->getCharset())!='UTF-8') {
 			self::convertToUtf8($value, $enc);
 		}
 
-		$s = @json_encode($value,$options);
+		$s=@json_encode($value, $options);
 		self::checkJsonError();
 		return $s;
 	}
@@ -243,7 +243,7 @@ 
 	private static function convertToUtf8(&$value, $sourceEncoding) {
 		if(is_string($value))
 			$value=iconv($sourceEncoding, 'UTF-8', $value);
-		else if (is_array($value))
+		else if(is_array($value))
 		{
 			foreach($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
@@ -258,37 +258,37 @@ 
 	 * @param int recursion depth
 	 * @return mixed decoded variable
 	 */
-	public static function jsonDecode($value, $assoc = false, $depth = 512)
+	public static function jsonDecode($value, $assoc=false, $depth=512)
 	{
-		$s= @json_decode($value, $assoc, $depth);
+		$s=@json_decode($value, $assoc, $depth);
 		self::checkJsonError();
 		return $s;
 	}
 
 	private static function checkJsonError()
 	{
-		switch ($err = json_last_error())
+		switch($err=json_last_error())
 		{
 			case JSON_ERROR_NONE:
 				return;
 				break;
 			case JSON_ERROR_DEPTH:
-				$msg = 'Maximum stack depth exceeded';
+				$msg='Maximum stack depth exceeded';
 				break;
 			case JSON_ERROR_STATE_MISMATCH:
-				$msg = 'Underflow or the modes mismatch';
+				$msg='Underflow or the modes mismatch';
 				break;
 			case JSON_ERROR_CTRL_CHAR:
-				$msg = 'Unexpected control character found';
+				$msg='Unexpected control character found';
 				break;
 			case JSON_ERROR_SYNTAX:
-				$msg = 'Syntax error, malformed JSON';
+				$msg='Syntax error, malformed JSON';
 				break;
 			case JSON_ERROR_UTF8:
-				$msg = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+				$msg='Malformed UTF-8 characters, possibly incorrectly encoded';
 				break;
 			default:
-				$msg = 'Unknown error';
+				$msg='Unknown error';
 				break;
 		}
 		throw new Exception("JSON error ($err): $msg");

framework/Web/TUrlManager.php

Spacing +11 added lines, -11 removed lines

@@ -64,10 +64,10 @@ 
 	 * @return string URL
 	 * @see parseUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		$url=$serviceID.'='.urlencode($serviceParam);
-		$amp=$encodeAmpersand?'&':'&';
+		$amp=$encodeAmpersand ? '&' : '&';
 		$request=$this->getRequest();
 		if(is_array($getItems) || $getItems instanceof Traversable)
 		{
@@ -103,9 +103,9 @@ 
 		switch($request->getUrlFormat())
 		{
 			case THttpRequestUrlFormat::Path:
-				return $request->getApplicationUrl().'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return $request->getApplicationUrl().'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			case THttpRequestUrlFormat::HiddenPath:
-				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			default:
 				return $request->getApplicationUrl().'?'.$url;
 		}
@@ -127,24 +127,24 @@ 
 	public function parseUrl()
 	{
 		$request=$this->getRequest();
-		$pathInfo=trim($request->getPathInfo(),'/');
+		$pathInfo=trim($request->getPathInfo(), '/');
 		if(($request->getUrlFormat()===THttpRequestUrlFormat::Path ||
 			$request->getUrlFormat()===THttpRequestUrlFormat::HiddenPath) &&
 			$pathInfo!=='')
 		{
 			$separator=$request->getUrlParamSeparator();
-			$paths=explode('/',$pathInfo);
+			$paths=explode('/', $pathInfo);
 			$getVariables=array();
 			foreach($paths as $path)
 			{
 				if(($path=trim($path))!=='')
 				{
-					if(($pos=strpos($path,$separator))!==false)
+					if(($pos=strpos($path, $separator))!==false)
 					{
-						$name=substr($path,0,$pos);
-						$value=substr($path,$pos+1);
-						if(($pos=strpos($name,'[]'))!==false)
-							$getVariables[substr($name,0,$pos)][]=$value;
+						$name=substr($path, 0, $pos);
+						$value=substr($path, $pos + 1);
+						if(($pos=strpos($name, '[]'))!==false)
+							$getVariables[substr($name, 0, $pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
 					}

framework/Web/THttpResponseAdapter.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 	 */
 	public function createNewHtmlWriter($type, $writer)
 	{
-		return $this->_response->createNewHtmlWriter($type,$writer);
+		return $this->_response->createNewHtmlWriter($type, $writer);
 	}
 }
 

framework/Web/Services/TJsonService.php

Spacing +12 added lines, -12 removed lines

@@ -77,7 +77,7 @@ 
 			if(is_array($config))
 			{
 				foreach($config['json'] as $id => $json)
-					$this->_services[$id] = $json;
+					$this->_services[$id]=$json;
 			}
 		}
 		else
@@ -109,14 +109,14 @@ 
 					$service=Prado::createComponent($serviceConfig['class']);
 					if($service instanceof TJsonResponse)
 					{
-						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:array();
-						$this->createJsonResponse($service,$properties,$serviceConfig);
+						$properties=isset($serviceConfig['properties']) ? $serviceConfig['properties'] : array();
+						$this->createJsonResponse($service, $properties, $serviceConfig);
 					}
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 			else
 			{
@@ -125,33 +125,33 @@ 
 				{
 					$service=Prado::createComponent($class);
 					if($service instanceof TJsonResponse)
-						$this->createJsonResponse($service,$properties,$serviceConfig);
+						$this->createJsonResponse($service, $properties, $serviceConfig);
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 		}
 		else
-			throw new THttpException(404,'jsonservice_provider_unknown',$id);
+			throw new THttpException(404, 'jsonservice_provider_unknown', $id);
 	}
 
 	/**
 	 * Renders content provided by TJsonResponse::getJsonContent() as
 	 * javascript in JSON format.
 	 */
-	protected function createJsonResponse($service,$properties,$config)
+	protected function createJsonResponse($service, $properties, $config)
 	{
 		// init service properties
 		foreach($properties as $name=>$value)
-			$service->setSubproperty($name,$value);
+			$service->setSubproperty($name, $value);
 		$service->init($config);
 
 		//send content if not null
 		if(($content=$service->getJsonContent())!==null)
 		{
-			$response = $this->getResponse();
+			$response=$this->getResponse();
 			$response->setContentType('application/json');
 			$response->setCharset('UTF-8');
 			//send content

framework/Web/UI/TCachePageStatePersister.php

Spacing +7 added lines, -7 removed lines

@@ -110,7 +110,7 @@ 
 			if($cache===null || !($cache instanceof ICache))
 			{
 				if($this->_cacheModuleID!=='')
-					throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid',$this->_cacheModuleID);
+					throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid', $this->_cacheModuleID);
 				else
 					throw new TConfigurationException('cachepagestatepersister_cache_required');
 			}
@@ -133,7 +133,7 @@ 
 	 */
 	public function setCacheTimeout($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>=0)
+		if(($value=TPropertyValue::ensureInteger($value)) >= 0)
 			$this->_timeout=$value;
 		else
 			throw new TInvalidDataValueException('cachepagestatepersister_timeout_invalid');
@@ -173,10 +173,10 @@ 
 	 */
 	public function save($data)
 	{
-		$timestamp=(string)microtime(true);
+		$timestamp=(string) microtime(true);
 		$key=$this->calculateKey($timestamp);
-		$this->getCache()->add($key,$data,$this->_timeout);
-		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page,$timestamp));
+		$this->getCache()->add($key, $data, $this->_timeout);
+		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page, $timestamp));
 	}
 
 	/**
@@ -186,13 +186,13 @@ 
 	 */
 	public function load()
 	{
-		if(($timestamp=TPageStateFormatter::unserialize($this->_page,$this->_page->getRequestClientState()))!==null)
+		if(($timestamp=TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState()))!==null)
 		{
 			$key=$this->calculateKey($timestamp);
 			if(($data=$this->getCache()->get($key))!==false)
 				return $data;
 		}
-		throw new THttpException(400,'cachepagestatepersister_pagestate_corrupted');
+		throw new THttpException(400, 'cachepagestatepersister_pagestate_corrupted');
 	}
 }
 

framework/Web/UI/ActiveControls/TCallbackClientScript.php

Spacing +36 added lines, -36 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_actions = new TList;
+		$this->_actions=new TList;
 	}
 
 	/**
@@ -88,14 +88,14 @@ 
 	public function callClientFunction($function, $params=array())
 	{
 		if(!is_array($params))
-			$params = array($params);
+			$params=array($params);
 
 		if(count($params) > 0)
 		{
-			if ($params[0] instanceof ISurroundable)
-				$params[0] = $params[0]->getSurroundingTagID();
+			if($params[0] instanceof ISurroundable)
+				$params[0]=$params[0]->getSurroundingTagID();
 			elseif($params[0] instanceof TControl)
-				$params[0] = $params[0]->getClientID();
+				$params[0]=$params[0]->getClientID();
 		}
 		$this->_actions->add(array($function => $params));
 	}
@@ -108,13 +108,13 @@ 
 	 */
 	public function jQuery($element, $method, $params=array())
 	{
-		if ($element instanceof ISurroundable)
-			$element = $element->getSurroundingTagID();
+		if($element instanceof ISurroundable)
+			$element=$element->getSurroundingTagID();
 		elseif($element instanceof TControl)
-			$element = $element->getClientID();
+			$element=$element->getClientID();
 
 		if(!is_array($params))
-			$params = array($params);
+			$params=array($params);
 
 		$this->_actions->add(array('Prado.Element.j' => array($element, $method, $params)));
 	}
@@ -147,14 +147,14 @@ 
 	 */
 	public function select($control, $method='Value', $value=null, $type=null)
 	{
-		$method = TPropertyValue::ensureEnum($method,
+		$method=TPropertyValue::ensureEnum($method,
 				'Value', 'Index', 'Clear', 'Indices', 'Values', 'All', 'Invert');
-		$type = ($type===null) ? $this->getSelectionControlType($control) : $type;
-		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
+		$type=($type===null) ? $this->getSelectionControlType($control) : $type;
+		$total=$this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
 
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
 		if($control instanceof TControl)
-			$control = $control->getClientID();
+			$control=$control->getClientID();
 
 		$this->callClientFunction('Prado.Element.select',
 				array($control, $type.$method, $value, $total));
@@ -214,9 +214,9 @@ 
 	public function setAttribute($control, $name, $value)
 	{
 		// Attributes should be applied on Surrounding tag, except for 'disabled' attribute
-		if ($control instanceof ISurroundable && strtolower($name)!=='disabled')
+		if($control instanceof ISurroundable && strtolower($name)!=='disabled')
 			$control=$control->getSurroundingTagID();
-		$this->callClientFunction('Prado.Element.setAttribute',array($control, $name, $value));
+		$this->callClientFunction('Prado.Element.setAttribute', array($control, $name, $value));
 	}
 
 	/**
@@ -226,25 +226,25 @@ 
 	 */
 	public function setListItems($control, $items)
 	{
-		$options = array();
+		$options=array();
 		if($control instanceof TListControl)
 		{
-			$promptText		= $control->getPromptText();
-			$promptValue	= $control->getPromptValue();
+			$promptText=$control->getPromptText();
+			$promptValue=$control->getPromptValue();
 
 			if($promptValue==='')
-				$promptValue = $promptText;
+				$promptValue=$promptText;
 
 			if($promptValue!=='')
-				$options[] = array($promptText, $promptValue);
+				$options[]=array($promptText, $promptValue);
 		}
 
 		foreach($items as $item)
 		{
 			if($item->getHasAttributes())
-				$options[] =  array($item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group'));
+				$options[]=array($item->getText(), $item->getValue(), $item->getAttributes()->itemAt('Group'));
 			else
-				$options[] = array($item->getText(),$item->getValue());
+				$options[]=array($item->getText(), $item->getValue());
 		}
 		$this->callClientFunction('Prado.Element.setOptions', array($control, $options));
 	}
@@ -422,16 +422,16 @@ 
 	{
 		if($content instanceof TControl)
 		{
-			$boundary = $this->getRenderedContentBoundary($content);
-			$content = null;
+			$boundary=$this->getRenderedContentBoundary($content);
+			$content=null;
 		}
 		else if($content instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($content);
-			$content = null;
+			$boundary=$this->getResponseContentBoundary($content);
+			$content=null;
 		}
 		else
-			$boundary = null;
+			$boundary=null;
 
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
 	}
@@ -456,11 +456,11 @@ 
 	{
 		if($writer instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($writer);
-			$content = null;
+			$boundary=$this->getResponseContentBoundary($writer);
+			$content=null;
 		} else {
-			$boundary = null;
-			$content = $writer;
+			$boundary=null;
+			$content=$writer;
 		}
 
 		$this->callClientFunction('Prado.Element.evaluateScript', array($content, $boundary));
@@ -476,11 +476,11 @@ 
 	{
 		if($content instanceof TControl)
 		{
-			$boundary = $this->getRenderedContentBoundary($content);
+			$boundary=$this->getRenderedContentBoundary($content);
 		}
 		elseif($content instanceof THtmlWriter)
 		{
-			$boundary = $this->getResponseContentBoundary($content);
+			$boundary=$this->getResponseContentBoundary($content);
 		}
 
 		$this->callClientFunction('Prado.Element.appendScriptBlock', array($boundary));
@@ -496,8 +496,8 @@ 
 	 */
 	private function getRenderedContentBoundary($control)
 	{
-		$writer = $this->getResponse()->createHtmlWriter();
-		$adapter = $control->getPage()->getAdapter();
+		$writer=$this->getResponse()->createHtmlWriter();
+		$adapter=$control->getPage()->getAdapter();
 		$adapter->registerControlToRender($control, $writer);
 		return $writer->getWriter()->getBoundary();
 	}
@@ -561,7 +561,7 @@ 
 	 */
 	public function fadeTo($element, $value, $duration=500)
 	{
-		$value = TPropertyValue::ensureFloat($value);
+		$value=TPropertyValue::ensureFloat($value);
 		$this->visualEffect('fadeTo', $element, array($duration, $value));
 	}
 

framework/Web/UI/ActiveControls/TValueTriggeredCallback.php

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function setDecayRate($value)
 	{
-		$decay = TPropertyValue::ensureFloat($value);
+		$decay=TPropertyValue::ensureFloat($value);
 		if($decay < 0)
 			throw new TConfigurationException('callback_decay_be_not_negative', $this->getID());
 		$this->setViewState('Decay', $decay);
@@ -90,10 +90,10 @@ 
 	 */
 	protected function getTriggerOptions()
 	{
-		$options = parent::getTriggerOptions();
-		$options['PropertyName'] = $this->getPropertyName();
-		$options['Interval'] = $this->getInterval();
-		$options['Decay'] = $this->getDecayRate();
+		$options=parent::getTriggerOptions();
+		$options['PropertyName']=$this->getPropertyName();
+		$options['Interval']=$this->getInterval();
+		$options['Decay']=$this->getDecayRate();
 		return $options;
 	}
 

framework/Web/UI/ActiveControls/TActiveClientScript.php

Spacing +3 added lines, -3 removed lines

@@ -41,11 +41,11 @@ 
 	 */
 	protected function renderCustomScriptFile($writer)
 	{
-		if(($scriptUrl = $this->getScriptUrl())!=='')
+		if(($scriptUrl=$this->getScriptUrl())!=='')
 		{
 			if($this->getPage()->getIsCallback())
 			{
-				$cs = $this->getPage()->getClientScript();
+				$cs=$this->getPage()->getClientScript();
 				$uniqueid=$this->ClientID.'_custom';
 				if(!$cs->isScriptFileRegistered($uniqueid))
 					$cs->registerScriptFile($uniqueid, $scriptUrl);
@@ -65,7 +65,7 @@ 
 		{
 			if($this->getPage()->getIsCallback())
 			{
-				$extWriter= $this->getPage()->getResponse()->createHtmlWriter();
+				$extWriter=$this->getPage()->getResponse()->createHtmlWriter();
 				$extWriter->write("/*<![CDATA[*/\n");
 				$this->renderChildren($extWriter);
 				$extWriter->write("\n/*]]>*/");

framework/Web/UI/ActiveControls/TActiveRepeater.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,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());
 		}
 	}
 
@@ -94,10 +94,10 @@ 
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($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);
 		}
 	}
 
@@ -111,7 +111,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);
 			}
 		}
 	}
@@ -123,7 +123,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	private function renderRepeater($writer) {
-		$writer->addAttribute('id',$this->getSurroundingTagID());
+		$writer->addAttribute('id', $this->getSurroundingTagID());
 		$writer->renderBeginTag($this->getSurroundingTag());
 		parent::render($writer);
 		$writer->renderEndTag();