pradosoft / prado

framework/Web/Services/TFeedService.php

Braces +5 added lines, -10 removed lines

@@ -80,8 +80,7 @@ 
 				foreach($config as $id => $feed)
 					$this->_feeds[$id] = $feed;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
@@ -122,11 +121,9 @@ 
 						$properties = isset($feedConfig['properties'])?$feedConfig['properties']:[];
 					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)
@@ -134,8 +131,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);
 			}
 
@@ -148,8 +144,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/Services/TSoapService.php

Braces +4 added lines, -8 removed lines

@@ -126,8 +126,7 @@ 
 				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadConfig($dom);
-			}
-			else
+			} else
 				throw new TConfigurationException('soapservice_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
@@ -149,8 +148,7 @@ 
 		{
 			$serverID = substr($serverID, 0, $pos);
 			$this->_wsdlRequest = true;
-		}
-		else
+		} else
 			$this->_wsdlRequest = false;
 		$this->_serverID = $serverID;
 		if(!isset($this->_servers[$serverID]))
@@ -176,8 +174,7 @@ 
 					$this->_servers[$id] = $properties;
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('soap') as $serverXML)
 			{
@@ -284,8 +281,7 @@ 
 			Prado::trace("Generating WSDL", 'Prado\Web\Services\TSoapService');
 			$this->getResponse()->clear();
 			$this->getResponse()->write($server->getWsdl());
-		}
-		else
+		} else
 		{
 			// provide SOAP service
 			Prado::trace("Handling SOAP request", 'Prado\Web\Services\TSoapService');

framework/Web/Services/TSoapServer.php

Braces +4 added lines, -8 removed lines

@@ -81,14 +81,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());
@@ -200,13 +198,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/TPageConfiguration.php

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,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

@@ -87,8 +87,7 @@ 
 				foreach($config['json'] as $id => $json)
 					$this->_services[$id] = $json;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('json') as $json)
 			{
@@ -119,14 +118,11 @@ 
 					{
 						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:[];
 						$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)
@@ -136,12 +132,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/TAssetManager.php

Braces +2 added lines, -4 removed lines

@@ -173,8 +173,7 @@ 
 			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 				$this->copyFile($fullpath, $dst);
 			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
-		}
-		else
+		} else
 		{
 			$dir = $this->hash($fullpath);
 			if(!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
@@ -297,8 +296,7 @@ 
 						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
 					}
-				}
-				else
+				} else
 					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 			}
 			closedir($folder);

framework/Web/UI/TTheme.php

Braces +5 added lines, -10 removed lines

@@ -117,8 +117,7 @@ 
 					closedir($dir);
 					if($cacheValid)
 						$this->_skins = $skins;
-				}
-				else
+				} else
 				{
 					$cacheValid = true;
 					$this->_cssFiles = $cssFiles;
@@ -295,20 +294,16 @@ 
 							{
 								$setter = 'set' . $name;
 								$control->$setter($value);
-							}
-							else
+							} else
 								throw new TConfigurationException('theme_property_readonly', $type, $name);
-						}
-						else
+						} else
 							throw new TConfigurationException('theme_property_undefined', $type, $name);
-					}
-					else	// complex property
+					} else	// complex property
 						$control->setSubProperty($name, $value);
 				}
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/TTemplateControl.php

Braces +6 added lines, -12 removed lines

@@ -72,8 +72,7 @@ 
 			if(!isset(self::$_template[$class]))
 				self::$_template[$class] = $this->loadTemplate();
 			return self::$_template[$class];
-		}
-		else
+		} else
 			return $this->_localTemplate;
 	}
 
@@ -208,8 +207,7 @@ 
 			$controls = $placeholder->getParent()->getControls();
 			$loc = $controls->remove($placeholder);
 			$controls->insertAt($loc, $content);
-		}
-		else
+		} else
 			throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 	}
 
@@ -235,8 +233,7 @@ 
 			$master->ensureChildControls();
 			foreach($this->_contents as $id => $content)
 				$master->injectContent($id, $content);
-		}
-		elseif(!empty($this->_contents))
+		} elseif(!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}
@@ -264,8 +261,7 @@ 
 												$control->Checked = (boolean) $arObj->{$key};
 										elseif ($control instanceof TDatePicker)
 												$control->Date = $arObj->{$key};
-								}
-								else
+								} else
 								{
 										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
 										{
@@ -287,8 +283,7 @@ 
 										}
 										break;
 								}
-						}
-						catch (Exception $ex)
+						} catch (Exception $ex)
 						{
 								if ($throwExceptions)
 										throw $ex;
@@ -318,8 +313,7 @@ 
 										$arObj->{$key} = $control->Checked;
 								elseif ($control instanceof TDatePicker)
 										$arObj->{$key} = $control->Date;
-						}
-						catch (Exception $ex)
+						} catch (Exception $ex)
 						{
 								if ($throwExceptions)
 										throw $ex;

framework/Web/UI/TClientScriptManager.php

Braces +2 added lines, -4 removed lines

@@ -275,8 +275,7 @@ 
 		if(strpos($base, $assets->getBaseUrl()) === false)
 		{
 			return [$assets->getPublishedPath($base), $assets->publishFilePath($base)];
-		}
-		else
+		} else
 		{
 			return [$assets->getBasePath() . str_replace($assets->getBaseUrl(), '', $base), $base];
 		}
@@ -903,8 +902,7 @@ 
 			{
 				foreach($value as $v)
 					$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '[]" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
-			}
-			else
+			} else
 			{
 				$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
 			}