pradosoft / prado

framework/Web/Javascripts/packages.php

Spacing +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@ 
 //$Id: packages.php 3319 2013-09-08 20:59:44Z ctrlaltca $
 
 // To make future upgrades easier
-if (!defined('PROTOTYPE_DIR')) define ('PROTOTYPE_DIR', 'prototype-1.7');
-if (!defined('JQUERY_DIR')) define ('JQUERY_DIR', 'jquery');
-if (!defined('BOOTSTRAP_DIR')) define ('BOOTSTRAP_DIR', 'bootstrap3');
-if (!defined('SCRIPTACULOUS_DIR')) define ('SCRIPTACULOUS_DIR', 'scriptaculous-1.9.0');
+if(!defined('PROTOTYPE_DIR')) define('PROTOTYPE_DIR', 'prototype-1.7');
+if(!defined('JQUERY_DIR')) define('JQUERY_DIR', 'jquery');
+if(!defined('BOOTSTRAP_DIR')) define('BOOTSTRAP_DIR', 'bootstrap3');
+if(!defined('SCRIPTACULOUS_DIR')) define('SCRIPTACULOUS_DIR', 'scriptaculous-1.9.0');
 
 //package names and its contents (files relative to the current directory)
-$packages = array(
+$packages=array(
 	// base prado scripts
 	'prado' => array(
 		'prado/prado.js',
@@ -115,7 +115,7 @@ 
 
 
 //package names and their dependencies
-$dependencies = array(
+$dependencies=array(
 		'jquery'			=> array('jquery'),
 		'prado'				=> array('jquery', 'prado'),
 		'bootstrap'			=> array('jquery', 'bootstrap'),
@@ -138,7 +138,7 @@ 
 		'jqueryui'			=> array('jquery', 'jqueryui'),
 		'prototype'			=> array('prototype'),
 		'dragdrop'			=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop'),
-		'dragdropextra'		=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop','dragdropextra'),
+		'dragdropextra'		=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop', 'dragdropextra'),
 		'autocomplete'		=> array('prototype', 'jquery', 'prado', 'ajax', 'autocomplete'),
 );
 

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/Javascripts/JSMin.php

Spacing +66 added lines, -66 removed lines

@@ -46,29 +46,29 @@ 
  */
 
 class JSMin {
-  const ORD_LF    = 10;
-  const ORD_SPACE = 32;
+  const ORD_LF=10;
+  const ORD_SPACE=32;
 
-  protected $a           = '';
-  protected $b           = '';
-  protected $input       = '';
-  protected $inputIndex  = 0;
-  protected $inputLength = 0;
-  protected $lookAhead   = null;
-  protected $output      = '';
+  protected $a='';
+  protected $b='';
+  protected $input='';
+  protected $inputIndex=0;
+  protected $inputLength=0;
+  protected $lookAhead=null;
+  protected $output='';
 
   // -- Public Static Methods --------------------------------------------------
 
   public static function minify($js) {
-    $jsmin = new JSMin($js);
+    $jsmin=new JSMin($js);
     return $jsmin->min();
   }
 
   // -- Public Instance Methods ------------------------------------------------
 
   public function __construct($input) {
-    $this->input       = str_replace("\r\n", "\n", $input);
-    $this->inputLength = strlen($this->input);
+    $this->input=str_replace("\r\n", "\n", $input);
+    $this->inputLength=strlen($this->input);
   }
 
   // -- Protected Instance Methods ---------------------------------------------
@@ -76,80 +76,80 @@ 
   protected function action($d) {
     switch($d) {
       case 1:
-        $this->output .= $this->a;
+        $this->output.=$this->a;
 
       case 2:
-        $this->a = $this->b;
+        $this->a=$this->b;
 
-        if ($this->a === "'" || $this->a === '"') {
-          for (;;) {
-            $this->output .= $this->a;
-            $this->a       = $this->get();
+        if($this->a==="'" || $this->a==='"') {
+          for(;;) {
+            $this->output.=$this->a;
+            $this->a=$this->get();
 
-            if ($this->a === $this->b) {
+            if($this->a===$this->b) {
               break;
             }
 
-            if (ord($this->a) <= self::ORD_LF) {
+            if(ord($this->a) <= self::ORD_LF) {
               throw new JSMinException('Unterminated string literal.');
             }
 
-            if ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
+            if($this->a==='\\') {
+              $this->output.=$this->a;
+              $this->a=$this->get();
             }
           }
         }
 
       case 3:
-        $this->b = $this->next();
+        $this->b=$this->next();
 
-        if ($this->b === '/' && (
-            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
-            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
-            $this->a === '&' || $this->a === '|' || $this->a === '?')) {
+        if($this->b==='/' && (
+            $this->a==='(' || $this->a===',' || $this->a==='=' ||
+            $this->a===':' || $this->a==='[' || $this->a==='!' ||
+            $this->a==='&' || $this->a==='|' || $this->a==='?')) {
 
-          $this->output .= $this->a . $this->b;
+          $this->output.=$this->a.$this->b;
 
-          for (;;) {
-            $this->a = $this->get();
+          for(;;) {
+            $this->a=$this->get();
 
-            if ($this->a === '/') {
+            if($this->a==='/') {
               break;
-            } elseif ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            } elseif (ord($this->a) <= self::ORD_LF) {
+            } elseif($this->a==='\\') {
+              $this->output.=$this->a;
+              $this->a=$this->get();
+            } elseif(ord($this->a) <= self::ORD_LF) {
               throw new JSMinException('Unterminated regular expression '.
                   'literal.');
             }
 
-            $this->output .= $this->a;
+            $this->output.=$this->a;
           }
 
-          $this->b = $this->next();
+          $this->b=$this->next();
         }
     }
   }
 
   protected function get() {
-    $c = $this->lookAhead;
-    $this->lookAhead = null;
+    $c=$this->lookAhead;
+    $this->lookAhead=null;
 
-    if ($c === null) {
-      if ($this->inputIndex < $this->inputLength) {
-        $c = $this->input[$this->inputIndex];
-        $this->inputIndex += 1;
+    if($c===null) {
+      if($this->inputIndex < $this->inputLength) {
+        $c=$this->input[$this->inputIndex];
+        $this->inputIndex+=1;
       } else {
-        $c = null;
+        $c=null;
       }
     }
 
-    if ($c === "\r") {
+    if($c==="\r") {
       return "\n";
     }
 
-    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
+    if($c===null || $c==="\n" || ord($c) >= self::ORD_SPACE) {
       return $c;
     }
 
@@ -157,17 +157,17 @@ 
   }
 
   protected function isAlphaNum($c) {
-    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
+    return ord($c) > 126 || $c==='\\' || preg_match('/^[\w\$]$/', $c)===1;
   }
 
   protected function min() {
-    $this->a = "\n";
+    $this->a="\n";
     $this->action(3);
 
-    while ($this->a !== null) {
-      switch ($this->a) {
+    while($this->a!==null) {
+      switch($this->a) {
         case ' ':
-          if ($this->isAlphaNum($this->b)) {
+          if($this->isAlphaNum($this->b)) {
             $this->action(1);
           } else {
             $this->action(2);
@@ -175,7 +175,7 @@ 
           break;
 
         case "\n":
-          switch ($this->b) {
+          switch($this->b) {
             case '{':
             case '[':
             case '(':
@@ -189,7 +189,7 @@ 
               break;
 
             default:
-              if ($this->isAlphaNum($this->b)) {
+              if($this->isAlphaNum($this->b)) {
                 $this->action(1);
               }
               else {
@@ -199,9 +199,9 @@ 
           break;
 
         default:
-          switch ($this->b) {
+          switch($this->b) {
             case ' ':
-              if ($this->isAlphaNum($this->a)) {
+              if($this->isAlphaNum($this->a)) {
                 $this->action(1);
                 break;
               }
@@ -210,7 +210,7 @@ 
               break;
 
             case "\n":
-              switch ($this->a) {
+              switch($this->a) {
                 case '}':
                 case ']':
                 case ')':
@@ -222,7 +222,7 @@ 
                   break;
 
                 default:
-                  if ($this->isAlphaNum($this->a)) {
+                  if($this->isAlphaNum($this->a)) {
                     $this->action(1);
                   }
                   else {
@@ -242,15 +242,15 @@ 
   }
 
   protected function next() {
-    $c = $this->get();
+    $c=$this->get();
 
-    if ($c === '/') {
+    if($c==='/') {
       switch($this->peek()) {
         case '/':
-          for (;;) {
-            $c = $this->get();
+          for(;;) {
+            $c=$this->get();
 
-            if (ord($c) <= self::ORD_LF) {
+            if(ord($c) <= self::ORD_LF) {
               return $c;
             }
           }
@@ -258,10 +258,10 @@ 
         case '*':
           $this->get();
 
-          for (;;) {
+          for(;;) {
             switch($this->get()) {
               case '*':
-                if ($this->peek() === '/') {
+                if($this->peek()==='/') {
                   $this->get();
                   return ' ';
                 }
@@ -281,7 +281,7 @@ 
   }
 
   protected function peek() {
-    $this->lookAhead = $this->get();
+    $this->lookAhead=$this->get();
     return $this->lookAhead;
   }
 }

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/TRpcService.php

Spacing +40 added lines, -40 removed lines

@@ -59,17 +59,17 @@ 
 	/**
 	 * const string base api provider class which every API must extend
 	 */
-	const BASE_API_PROVIDER = 'TRpcApiProvider';
+	const BASE_API_PROVIDER='TRpcApiProvider';
 
 	/**
 	 * const string base RPC server implementation
 	 */
-	const BASE_RPC_SERVER = 'TRpcServer';
+	const BASE_RPC_SERVER='TRpcServer';
 
 	/**
 	 * @var array containing mimetype to protocol handler mappings
 	 */
-	protected $protocolHandlers = array(
+	protected $protocolHandlers=array(
 		'application/json' => 'TJsonRpcProtocol',
 		'text/xml' => 'TXmlRpcProtocol'
 	);
@@ -77,7 +77,7 @@ 
 	/**
 	 * @var array containing API provider and their configured properties
 	 */
-	protected $apiProviders = array();
+	protected $apiProviders=array();
 
 	// methods
 
@@ -88,27 +88,27 @@ 
 	 */
 	public function createApiProvider(TRpcProtocol $protocolHandler, $providerId)
 	{
-		$_properties = $this->apiProviders[$providerId];
+		$_properties=$this->apiProviders[$providerId];
 
-		if(($_providerClass = $_properties->remove('class')) === null)
+		if(($_providerClass=$_properties->remove('class'))===null)
 			throw new TConfigurationException('rpcservice_apiprovider_required');
 
 		Prado::using($_providerClass);
 
-		$_providerClassName = ($_pos = strrpos($_providerClass, '.')) !== false ? substr($_providerClass, $_pos + 1) : $_providerClass;
+		$_providerClassName=($_pos=strrpos($_providerClass, '.'))!==false ? substr($_providerClass, $_pos + 1) : $_providerClass;
 		if(!is_subclass_of($_providerClassName, self::BASE_API_PROVIDER))
 			throw new TConfigurationException('rpcservice_apiprovider_invalid');
 
-		if(($_rpcServerClass = $_properties->remove('server')) === null)
-			$_rpcServerClass = self::BASE_RPC_SERVER;
+		if(($_rpcServerClass=$_properties->remove('server'))===null)
+			$_rpcServerClass=self::BASE_RPC_SERVER;
 
 		Prado::using($_rpcServerClass);
 
-		$_rpcServerClassName = ($_pos = strrpos($_rpcServerClass, '.')) !== false ? substr($_rpcServerClass, $_pos + 1) : $_rpcServerClass;
+		$_rpcServerClassName=($_pos=strrpos($_rpcServerClass, '.'))!==false ? substr($_rpcServerClass, $_pos + 1) : $_rpcServerClass;
 		if($_rpcServerClassName!==self::BASE_RPC_SERVER && !is_subclass_of($_rpcServerClassName, self::BASE_RPC_SERVER))
 			throw new TConfigurationException('rpcservice_rpcserver_invalid');
 
-		$_apiProvider = new $_providerClassName(new $_rpcServerClassName($protocolHandler));
+		$_apiProvider=new $_providerClassName(new $_rpcServerClassName($protocolHandler));
 		$_apiProvider->setId($providerId);
 
 		foreach($_properties as $_key => $_value)
@@ -134,15 +134,15 @@ 
 	{
 		foreach($xml->getElementsByTagName('rpcapi') as $_apiProviderXml)
 		{
-			$_properties = $_apiProviderXml->getAttributes();
+			$_properties=$_apiProviderXml->getAttributes();
 
-			if(($_id = $_properties->remove('id')) === null || $_id == "")
+			if(($_id=$_properties->remove('id'))===null || $_id=="")
 				throw new TConfigurationException('rpcservice_apiproviderid_required');
 
 			if(isset($this->apiProviders[$_id]))
 				throw new TConfigurationException('rpcservice_apiproviderid_duplicated');
 
-			$this->apiProviders[$_id] = $_properties;
+			$this->apiProviders[$_id]=$_properties;
 		}
 	}
 
@@ -151,26 +151,26 @@ 
 	 */
 	public function run()
 	{
-		$_request = $this->getRequest();
+		$_request=$this->getRequest();
 
-		if(($_providerId = $_request->getServiceParameter()) == "")
+		if(($_providerId=$_request->getServiceParameter())=="")
 			throw new THttpException(400, 'RPC API-Provider id required');
 		
-		if(($_method = $_request->getRequestType()) != 'POST')
+		if(($_method=$_request->getRequestType())!='POST')
 			throw new THttpException(405, 'Invalid request method "'.$_method.'"!'); // TODO Exception muss "Allow POST" Header setzen
 
-		if(($_mimeType = $_request->getContentType()) === null)
+		if(($_mimeType=$_request->getContentType())===null)
 			throw new THttpException(406, 'Content-Type is missing!'); // TODO Exception muss gültige Content-Type werte zurück geben
 
 		if(!in_array($_mimeType, array_keys($this->protocolHandlers)))
 			throw new THttpException(406, 'Unsupported Content-Type!'); // TODO see previous
 
-		$_protocolHandlerClass = $this->protocolHandlers[$_mimeType];
-		$_protocolHandler = new $_protocolHandlerClass;
+		$_protocolHandlerClass=$this->protocolHandlers[$_mimeType];
+		$_protocolHandler=new $_protocolHandlerClass;
 
-		if(($_result = $this->createApiProvider($_protocolHandler, $_providerId)->processRequest()) !== null)
+		if(($_result=$this->createApiProvider($_protocolHandler, $_providerId)->processRequest())!==null)
 		{
-			$_response = $this->getResponse();
+			$_response=$this->getResponse();
 			$_protocolHandler->createResponseHeaders($_response);
 			$_response->write($_result);
 		}
@@ -206,7 +206,7 @@ 
 	 */
 	public function __construct(TRpcProtocol $protocolHandler)
 	{
-		$this->handler = $protocolHandler;
+		$this->handler=$protocolHandler;
 	}
 	
 	/**
@@ -258,7 +258,7 @@ 
  */
 class TRpcException extends TException
 {
-	public function __construct($message, $errorCode = -1)
+	public function __construct($message, $errorCode=-1)
 	{
 		$this->setErrorCode($errorCode);
 
@@ -318,7 +318,7 @@ 
 	 */
 	public function __construct(TRpcServer $rpcServer)
 	{
-		$this->rpcServer = $rpcServer;
+		$this->rpcServer=$rpcServer;
 
 		foreach($this->registerMethods() as $_methodName => $_methodDetails)
 			$this->rpcServer->addRpcMethod($_methodName, $_methodDetails);
@@ -359,7 +359,7 @@ 
 	/**
 	 * @var array containing the mapping from RPC method names to the actual handlers
 	 */
-	protected $rpcMethods = array();
+	protected $rpcMethods=array();
 
 	// abstracts
 
@@ -407,7 +407,7 @@ 
 	 */
 	public function addMethod($methodName, $handlerDetails)
 	{
-		$this->rpcMethods[$methodName] = $handlerDetails;
+		$this->rpcMethods[$methodName]=$handlerDetails;
 	}
 
 	/**
@@ -421,11 +421,11 @@ 
 		if(!isset($this->rpcMethods[$methodName]))
 			throw new TRpcException('Method "'.$methodName.'" not found');
 
-		if($parameters === null)
-			$parameters = array();
+		if($parameters===null)
+			$parameters=array();
 
 		if(!is_array($parameters))
-			$parameters = array($parameters);
+			$parameters=array($parameters);
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}
 }
@@ -457,7 +457,7 @@ 
 	{
 		try
 		{
-			$_request = $this->decode($requestPayload);
+			$_request=$this->decode($requestPayload);
 
 			if(isset($_request['jsonrpc']))
 			{
@@ -473,15 +473,15 @@ 
 					throw new TRpcException('Missing request method', '-32600');
 
 			if(!isset($_request['params']))
-				$parameters = array();
+				$parameters=array();
 			else
-				$parameters = $_request['params'];
+				$parameters=$_request['params'];
 
 			if(!is_array($parameters))
-				$parameters = array($parameters);
+				$parameters=array($parameters);
 
 			// a request without an id is a notification that doesn't need a response
-			if($this->_id !== null)
+			if($this->_id!==null)
 			{
 				if($this->_specificationVersion==2.0)
 				{
@@ -560,7 +560,7 @@ 
 	 */
 	public function decode($data)
 	{
-		$s = json_decode($data, true);
+		$s=json_decode($data, true);
 		self::checkJsonError();
 		return $s;
 	}
@@ -572,15 +572,15 @@ 
 	 */
 	public function encode($data)
 	{
-		$s = json_encode($data);
+		$s=json_encode($data);
 		self::checkJsonError();
 		return $s;		
 	}
 
 	private static function checkJsonError()
 	{
-		$errnum = json_last_error();
-		if($errnum != JSON_ERROR_NONE)
+		$errnum=json_last_error();
+		if($errnum!=JSON_ERROR_NONE)
 			throw new Exception("JSON error: $msg", $err);
 	}
 
@@ -625,7 +625,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_xmlrpcServer = xmlrpc_server_create();
+		$this->_xmlrpcServer=xmlrpc_server_create();
 	}
 
 	/**

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/Services/TFeedService.php

Spacing +10 added lines, -10 removed lines

@@ -72,7 +72,7 @@ 
 			if(is_array($config))
 			{
 				foreach($config as $id => $feed)
-					$this->_feeds[$id] = $feed;
+					$this->_feeds[$id]=$feed;
 			}
 		}
 		else
@@ -105,20 +105,20 @@ 
 		if(isset($this->_feeds[$id]))
 		{
 			$feedConfig=$this->_feeds[$id];
-			$properties = array();
-			$feed = null;
+			$properties=array();
+			$feed=null;
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
 				if(isset($feedConfig['class']))
 				{
 					$feed=Prado::createComponent($feedConfig['class']);
 					if($service instanceof IFeedContentProvider)
-						$properties=isset($feedConfig['properties'])?$feedConfig['properties']:array();
+						$properties=isset($feedConfig['properties']) ? $feedConfig['properties'] : array();
 					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
 			{
@@ -127,15 +127,15 @@ 
 				{
 					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
-						throw new TConfigurationException('feedservice_feedtype_invalid',$id);
+						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('feedservice_class_required',$id);
+					throw new TConfigurationException('feedservice_class_required', $id);
 			}
 
 			// init feed properties
 			foreach($properties as $name=>$value)
-				$feed->setSubproperty($name,$value);
+				$feed->setSubproperty($name, $value);
 			$feed->init($feedConfig);
 
 			$content=$feed->getFeedContent();
@@ -144,7 +144,7 @@ 
 		    $this->getResponse()->write($content);
 		}
 		else
-			throw new THttpException(404,'feedservice_feed_unknown',$id);
+			throw new THttpException(404, 'feedservice_feed_unknown', $id);
 	}
 }
 

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');
 	}
 }