pradosoft / prado

framework/Web/THttpRequest.php

Braces +6 added lines, -12 removed lines

@@ -232,8 +232,7 @@ 
 				$port=$_SERVER['SERVER_PORT'];
 				if(($port!=80 && !$secure) || ($port!=443 && $secure))
 					$url.=':'.$port;
-			}
-			else
+			} else
 				$url.=$_SERVER['HTTP_HOST'];
 			$url.=$this->getRequestUri();
 			$this->_url=new TUri($url);
@@ -341,8 +340,7 @@ 
 				{
 					$this->_urlManager=new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager===null)
@@ -462,8 +460,7 @@ 
 
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = array();
 			foreach($_SERVER as $key=>$value) {
 				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
@@ -566,8 +563,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -670,8 +666,7 @@ 
 					if(($value=$sm->validateData($value))!==false)
 						$this->_cookies->add(new THttpCookie($key,$value));
 				}
-			}
-			else
+			} else
 			{
 				foreach($_COOKIE as $key=>$value)
 					$this->_cookies->add(new THttpCookie($key,$value));
@@ -888,8 +883,7 @@ 
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 

framework/Web/Services/TPageService.php

Braces +4 added lines, -8 removed lines

@@ -239,8 +239,7 @@ 
 					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
-		}
-		else
+		} else
 		{
 			$configCached=true;
 			$currentTimestamp=array();
@@ -258,8 +257,7 @@ 
 							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
 							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
 								$configCached=false;
-						}
-						else
+						} else
 						{
 							$currentTimestamp[$fileName]=@filemtime($fileName);
 							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName]))
@@ -267,8 +265,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$configCached=false;
 				$paths=explode('.',$pagePath);
@@ -501,8 +498,7 @@ 
 
 			if(!class_exists($className,false))
 				$className = $namespacedClassName;
-		}
-		else
+		} else
 		{
 			$className=$this->getBasePageClass();
 			Prado::using($className);

framework/Web/Services/TJsonRpcProtocol.php

Braces +3 added lines, -6 removed lines

@@ -78,16 +78,13 @@
 					));
 				}
 			}
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->createErrorResponse($e);
-		}
-		catch(THttpException $e)
+		} catch(THttpException $e)
 		{
 			throw $e;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured', '-32603'));
 		}

framework/Web/Services/TSoapServer.php

Braces +4 added lines, -8 removed lines

@@ -80,14 +80,12 @@ 
 			$server->setClass($providerClass, $this);
 			if($this->_persistent)
 				$server->setPersistence(SOAP_PERSISTENCE_SESSION);
-		}
-		else
+		} else
 			$server=$this->createServer();
 		try
 		{
 			$server->handle();
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
@@ -199,13 +197,11 @@ 
 				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl);
 				return $wsdl;
-			}
-			else
+			} else
 			{
 				return WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 			}
-		}
-		else
+		} else
 			return file_get_contents($this->_wsdlUri);
 	}
 

framework/Web/Services/TXmlRpcProtocol.php

Braces +3 added lines, -6 removed lines

@@ -72,16 +72,13 @@
 		try
 		{
 			return xmlrpc_server_call_method($this->_xmlrpcServer, $requestPayload, null);
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->createErrorResponse($e);
-		}
-		catch(THttpException $e)
+		} catch(THttpException $e)
 		{
 			throw $e;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured'));
 		}

framework/Web/Services/TRpcServer.php

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 		try
 		{
 			return $this->handler->callMethod($this->getPayload());
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->handler->createErrorResponse($e);
 		}

framework/Web/Services/TFeedService.php

Braces +5 added lines, -10 removed lines

@@ -79,8 +79,7 @@ 
 				foreach($config as $id => $feed)
 					$this->_feeds[$id] = $feed;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
@@ -121,11 +120,9 @@ 
 						$properties=isset($feedConfig['properties'])?$feedConfig['properties']:array();
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
-			}
-			else
+			} else
 			{
 				$properties=$feedConfig->getAttributes();
 				if(($class=$properties->remove('class'))!==null)
@@ -133,8 +130,7 @@ 
 					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
 						throw new TConfigurationException('feedservice_feedtype_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('feedservice_class_required',$id);
 			}
 
@@ -147,8 +143,7 @@ 
 		    //$this->getResponse()->setContentType('application/rss+xml');
 		    $this->getResponse()->setContentType($feed->getContentType());
 		    $this->getResponse()->write($content);
-		}
-		else
+		} else
 			throw new THttpException(404,'feedservice_feed_unknown',$id);
 	}
 }
\ No newline at end of file

framework/Web/TUrlMappingPattern.php

Braces +7 added lines, -10 removed lines

@@ -363,10 +363,10 @@ 
 			$params=explode('/',$matches['urlparams']);
 			if ($this->_separator==='/')
 			{
-				while($key=array_shift($params))
-					$matches[$key]=($value=array_shift($params)) ? $value : '';
-			}
-			else
+				while($key=array_shift($params)) {
+									$matches[$key]=($value=array_shift($params)) ? $value : '';
+				}
+			} else
 			{
 				array_pop($params);
 				foreach($params as $param)
@@ -558,12 +558,10 @@ 
 						$name=rawurlencode($name.'[]');
 						foreach($value as $v)
 							$url2.=$amp.$name.'='.rawurlencode($v);
-					}
-					else
+					} else
 						$url2.=$amp.rawurlencode($name).'='.rawurlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($extra as $name=>$value)
 				{
@@ -571,8 +569,7 @@ 
 					{
 						foreach($value as $v)
 							$url2.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url2.=$amp.$name.'='.$value;
 				}
 			}

framework/Web/TUrlMapping.php

Braces +4 added lines, -8 removed lines

@@ -136,15 +136,13 @@ 
 			{
 				$config = include $this->_configFile;
 				$this->loadUrlMappings($dom);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadUrlMappings($dom);
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
 	}
 
@@ -251,8 +249,7 @@ 
 					$this->buildUrlMapping($class,$properties,$url);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('url') as $url)
 			{
@@ -366,8 +363,7 @@ 
 					if($rule->supportCustomUrl($getItems))
 						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
 				}
-			}
-			elseif(isset($this->_constructRules[$wildCardKey]))
+			} elseif(isset($this->_constructRules[$wildCardKey]))
 			{
 				foreach($this->_constructRules[$wildCardKey] as $rule)
 				{