pradosoft / prado

framework/Web/Services/TRpcService.php

Braces +7 added lines, -14 removed lines

@@ -237,8 +237,7 @@ 
 		try
 		{
 			return $this->handler->callMethod($this->getPayload());
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->handler->createErrorResponse($e);
 		}
@@ -498,16 +497,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'));
 		}
@@ -662,16 +658,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/TPageService.php

Braces +5 added lines, -10 removed lines

@@ -232,8 +232,7 @@ 
 					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
-		}
-		else
+		} else
 		{
 			$configCached=true;
 			$currentTimestamp=array();
@@ -251,8 +250,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]))
@@ -260,8 +258,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$configCached=false;
 				$paths=explode('.',$pagePath);
@@ -489,8 +486,7 @@ 
 			$className=basename($path);
 			if(!class_exists($className,false))
 				include_once($path.Prado::CLASS_FILE_EXT);
-		}
-		else
+		} else
 		{
 			$className=$this->getBasePageClass();
 			Prado::using($className);
@@ -659,8 +655,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))

framework/Web/Services/TJsonService.php

Braces +6 added lines, -12 removed lines

@@ -79,8 +79,7 @@ 
 				foreach($config['json'] as $id => $json)
 					$this->_services[$id] = $json;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('json') as $json)
 			{
@@ -111,14 +110,11 @@ 
 					{
 						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:array();
 						$this->createJsonResponse($service,$properties,$serviceConfig);
-					}
-					else
+					} else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
-			}
-			else
+			} else
 			{
 				$properties=$serviceConfig->getAttributes();
 				if(($class=$properties->remove('class'))!==null)
@@ -128,12 +124,10 @@ 
 						$this->createJsonResponse($service,$properties,$serviceConfig);
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
 			}
-		}
-		else
+		} else
 			throw new THttpException(404,'jsonservice_provider_unknown',$id);
 	}
 

framework/Web/Services/TSoapService.php

Braces +8 added lines, -16 removed lines

@@ -118,8 +118,7 @@ 
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadConfig($dom);
-			}
-			else
+			} else
 				throw new TConfigurationException('soapservice_configfile_invalid',$this->_configFile);
 		}
 		$this->loadConfig($config);
@@ -141,8 +140,7 @@ 
 		{
 			$serverID=substr($serverID,0,$pos);
 			$this->_wsdlRequest=true;
-		}
-		else
+		} else
 			$this->_wsdlRequest=false;
 		$this->_serverID=$serverID;
 		if(!isset($this->_servers[$serverID]))
@@ -168,8 +166,7 @@ 
 					$this->_servers[$id]=$properties;
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('soap') as $serverXML)
 			{
@@ -276,8 +273,7 @@ 
 			Prado::trace("Generating WSDL",'System.Web.Services.TSoapService');
 			$this->getResponse()->clear();
 			$this->getResponse()->write($server->getWsdl());
-		}
-		else
+		} else
 		{
 			// provide SOAP service
 			Prado::trace("Handling SOAP request",'System.Web.Services.TSoapService');
@@ -350,14 +346,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());
@@ -470,14 +464,12 @@ 
 				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl);
 				return $wsdl;
-			}
-			else
+			} else
 			{
 				Prado::using('System.3rdParty.WsdlGen.WsdlGenerator');
 				return WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 			}
-		}
-		else
+		} else
 			return file_get_contents($this->_wsdlUri);
 	}
 

framework/Web/Services/TFeedService.php

Braces +5 added lines, -10 removed lines

@@ -74,8 +74,7 @@ 
 				foreach($config as $id => $feed)
 					$this->_feeds[$id] = $feed;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
@@ -116,11 +115,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)
@@ -128,8 +125,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);
 			}
 
@@ -142,8 +138,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);
 	}
 }

framework/Web/UI/ActiveControls/TActiveControlAdapter.php

Braces +3 added lines, -6 removed lines

@@ -72,8 +72,7 @@ 
 				$this->_activeControlType = 'TBaseActiveCallbackControl';
 			else
 				$this->_activeControlType = 'TBaseActiveControl';
-		}
-		else
+		} else
 			$this->_activeControlType = $type;
 	}
 
@@ -491,8 +490,7 @@ 
 		{
 			return ($this->_new!==null) && $this->_new->hasCssClass()
 						? $this->_new->getCssClass() : null;
-		}
-		else
+		} else
 		{
 			return $this->_old->getCssClass() !== $this->_new->getCssClass() ?
 				$this->_new->getCssClass() : null;
@@ -548,8 +546,7 @@ 
 		if($this->_old===null)
 		{
 			return ($this->_new!==null) ? $this->_new->toArray() : $this->_null;
-		}
-		else
+		} else
 		{
 			$new = $this->_new->toArray();
 			$old = $this->_old->toArray();

framework/Web/UI/ActiveControls/TActivePageAdapter.php

Braces +3 added lines, -6 removed lines

@@ -251,14 +251,12 @@ 
 				$param = $this->getCallbackEventParameter();
 				$result = new TCallbackEventParameter($this->getResponse(), $param);
 				$callbackHandler->raiseCallbackEvent($result);
-			}
-			else
+			} else
 			{
 				throw new TInvalidCallbackException(
 					'callback_invalid_handler', $callbackHandler->getUniqueID());
 			}
-		 }
-		 else
+		 } else
 		 {
 		 	$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
 		 	throw new TInvalidCallbackException('callback_invalid_target', $target);
@@ -365,8 +363,7 @@ 
 			$content = $response->createHtmlWriter();
 			$content->getWriter()->setBoundary(TActivePageAdapter::CALLBACK_ERROR_HEADER);
 			$content->write($trace);
-		}
-		else
+		} else
 		{
 			error_log("Error happened while processing an existing error:\n".$exception->__toString());
 			header('HTTP/1.0 500 Internal Server Error', true, 500);

framework/Web/UI/ActiveControls/TActiveTableCell.php

Braces +1 added lines, -2 removed lines

@@ -95,8 +95,7 @@
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}
 	}

framework/Web/UI/ActiveControls/TActiveTableRow.php

Braces +2 added lines, -4 removed lines

@@ -119,8 +119,7 @@ 
 		{
 			$this->raiseCallbackEvent($param);
 			return true;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -163,8 +162,7 @@ 
 			parent::render($writer);
 			if ($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableRow on callback, we shouldn't update all childs,