pradosoft / prado

framework/Web/UI/ActiveControls/TActiveImage.php

Spacing +8 added lines, -8 removed lines

@@ -48,11 +48,11 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		if(parent::getAlternateText() === $value)
+		if (parent::getAlternateText() === $value)
 			return;
 
 		parent::setAlternateText($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->getPage()->getCallbackClient()->setAttribute($this, 'alt', $value);
 	}
 
@@ -65,11 +65,11 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		if(parent::getImageAlign() === $value)
+		if (parent::getImageAlign() === $value)
 			return;
 
 		parent::setImageAlign($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->getPage()->getCallbackClient()->setAttribute($this, 'align', $value);
 	}
 
@@ -78,11 +78,11 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if (parent::getImageUrl() === $value)
 			return;
 
 		parent::setImageUrl($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->getPage()->getCallbackClient()->setAttribute($this, 'src', $value);
 	}
 
@@ -91,11 +91,11 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		if(parent::getDescriptionUrl() === $value)
+		if (parent::getDescriptionUrl() === $value)
 			return;
 
 		parent::setDescriptionUrl($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->getPage()->getCallbackClient()->setAttribute($this, 'longdesc', $value);
 	}
 }

Braces +24 added lines, -16 removed lines

@@ -48,12 +48,14 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		if(parent::getAlternateText() === $value)
-			return;
+		if(parent::getAlternateText() === $value) {
+					return;
+		}
 
 		parent::setAlternateText($value);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getCallbackClient()->setAttribute($this, 'alt', $value);
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->getPage()->getCallbackClient()->setAttribute($this, 'alt', $value);
+		}
 	}
 
 	/**
@@ -65,12 +67,14 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		if(parent::getImageAlign() === $value)
-			return;
+		if(parent::getImageAlign() === $value) {
+					return;
+		}
 
 		parent::setImageAlign($value);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getCallbackClient()->setAttribute($this, 'align', $value);
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->getPage()->getCallbackClient()->setAttribute($this, 'align', $value);
+		}
 	}
 
 	/**
@@ -78,12 +82,14 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
-			return;
+		if(parent::getImageUrl() === $value) {
+					return;
+		}
 
 		parent::setImageUrl($value);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getCallbackClient()->setAttribute($this, 'src', $value);
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->getPage()->getCallbackClient()->setAttribute($this, 'src', $value);
+		}
 	}
 
 	/**
@@ -91,12 +97,14 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		if(parent::getDescriptionUrl() === $value)
-			return;
+		if(parent::getDescriptionUrl() === $value) {
+					return;
+		}
 
 		parent::setDescriptionUrl($value);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getCallbackClient()->setAttribute($this, 'longdesc', $value);
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->getPage()->getCallbackClient()->setAttribute($this, 'longdesc', $value);
+		}
 	}
 }
 

framework/Web/UI/ActiveControls/TActiveCustomValidator.php

Braces +3 added lines, -2 removed lines

@@ -145,8 +145,9 @@
 	 */
 	public function setErrorMessage($value)
 	{
-		if(parent::getErrorMessage() === $value)
-			return;
+		if(parent::getErrorMessage() === $value) {
+					return;
+		}
 
 
 		parent::setErrorMessage($value);

Spacing +3 added lines, -3 removed lines

@@ -114,7 +114,7 @@ 
 		// it could have been changed by the clientside validation.
 
 		parent::setIsValid($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
 			$client = $this->getPage()->getCallbackClient();
 			$func = 'Prado.Validation.updateActiveCustomValidator';
@@ -151,12 +151,12 @@ 
 	 */
 	public function setErrorMessage($value)
 	{
-		if(parent::getErrorMessage() === $value)
+		if (parent::getErrorMessage() === $value)
 			return;
 
 
 		parent::setErrorMessage($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
 			$client = $this->getPage()->getCallbackClient();
 			$func = 'Prado.Validation.setErrorMessage';

framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php

Braces +6 added lines, -4 removed lines

@@ -44,11 +44,13 @@
 	public function setInterval($value)
 	{
 		$interval = TPropertyValue::ensureFloat($value);
-		if($interval <= 0)
-			throw new TConfigurationException('callback_interval_be_positive', $this->getID());
+		if($interval <= 0) {
+					throw new TConfigurationException('callback_interval_be_positive', $this->getID());
+		}
 
-		if($this->getInterval() === $value)
-			return;
+		if($this->getInterval() === $value) {
+					return;
+		}
 
 		$this->setViewState('Interval', $interval, 1);
 		if ($this->getActiveControl()->canUpdateClientSide()){

Spacing +4 added lines, -4 removed lines

@@ -49,14 +49,14 @@ 
 	public function setInterval($value)
 	{
 		$interval = TPropertyValue::ensureFloat($value);
-		if($interval <= 0)
+		if ($interval <= 0)
 			throw new TConfigurationException('callback_interval_be_positive', $this->getID());
 
-		if($this->getInterval() === $value)
+		if ($this->getInterval() === $value)
 			return;
 
 		$this->setViewState('Interval', $interval, 1);
-		if ($this->getActiveControl()->canUpdateClientSide()){
+		if ($this->getActiveControl()->canUpdateClientSide()) {
 			$client = $this->getPage()->getCallbackClient();
 			$client->callClientFunction('Prado.WebUI.TTimeTriggeredCallback.setTimerInterval', [$this, $interval]);
 		}
@@ -117,7 +117,7 @@ 
 		parent::render($writer);
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getTriggerOptions());
-		if($this->getStartTimerOnLoad()){
+		if ($this->getStartTimerOnLoad()) {
 			$id = $this->getClientID();
 			$code = "Prado.WebUI.TTimeTriggeredCallback.start('{$id}');";
 			$cs = $this->getPage()->getClientScript();

framework/Web/UI/TControlAdapter.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	 */
 	public function getPage()
 	{
-		return $this->_control?$this->_control->getPage():null;
+		return $this->_control ? $this->_control->getPage() : null;
 	}
 
 	/**

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

Spacing +3 added lines, -3 removed lines

@@ -74,15 +74,15 @@
 		{
 			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);
 		}

Spacing +1 added lines, -1 removed lines

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

framework/PradoBase.php

Indentation +4 added lines, -4 removed lines

@@ -28,13 +28,13 @@
 if(!defined('PRADO_DIR'))
 	define('PRADO_DIR', __DIR__);
 /**
- * Defines the default permission for writable directories and files
- */
+	 * Defines the default permission for writable directories and files
+	 */
 if(!defined('PRADO_CHMOD'))
 	define('PRADO_CHMOD', 0777);
 /**
- * Defines the Composer's vendor/ path.
- */
+	 * Defines the Composer's vendor/ path.
+	 */
 if(!defined('PRADO_VENDORDIR'))
 {
 	$reflector = new \ReflectionClass('\Composer\Autoload\ClassLoader');

Spacing +86 added lines, -86 removed lines

@@ -25,17 +25,17 @@ 
 /**
  * Defines the PRADO framework installation path.
  */
-if(!defined('PRADO_DIR'))
+if (!defined('PRADO_DIR'))
 	define('PRADO_DIR', __DIR__);
 /**
  * Defines the default permission for writable directories and files
  */
-if(!defined('PRADO_CHMOD'))
+if (!defined('PRADO_CHMOD'))
 	define('PRADO_CHMOD', 0777);
 /**
  * Defines the Composer's vendor/ path.
  */
-if(!defined('PRADO_VENDORDIR'))
+if (!defined('PRADO_VENDORDIR'))
 {
 	$reflector = new \ReflectionClass('\Composer\Autoload\ClassLoader');
 	define('PRADO_VENDORDIR', dirname(dirname($reflector->getFileName())));
@@ -109,7 +109,7 @@ 
 	 */
 	public static function initAutoloader()
 	{
-		self::$classMap = require(__DIR__ . '/classes.php');
+		self::$classMap = require(__DIR__.'/classes.php');
 
 		spl_autoload_register([get_called_class(), 'autoload']);
 	}
@@ -124,15 +124,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(['\Prado\PradoBase','phpErrorHandler']);
+		set_error_handler(['\Prado\PradoBase', 'phpErrorHandler']);
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(['PradoBase','phpFatalErrorHandler']);
+		register_shutdown_function(['PradoBase', 'phpFatalErrorHandler']);
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(['\Prado\PradoBase','exceptionHandler']);
+		set_exception_handler(['\Prado\PradoBase', 'exceptionHandler']);
 		/**
 		 * Disable php's builtin error reporting to avoid duplicated reports
 		 */
@@ -155,15 +155,15 @@ 
 	 */
 	public static function poweredByPrado($logoType = 0)
 	{
-		$logoName = $logoType == 1?'powered2':'powered';
-		if(self::$_application !== null)
+		$logoName = $logoType == 1 ? 'powered2' : 'powered';
+		if (self::$_application !== null)
 		{
 			$am = self::$_application->getAssetManager();
-			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\' . $logoName, '.gif'));
+			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\'.$logoName, '.gif'));
 		}
 		else
-			$url = 'http://pradosoft.github.io/docs/' . $logoName . '.gif';
-		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="' . $url . '" style="border-width:0px;" alt="Powered by PRADO" /></a>';
+			$url = 'http://pradosoft.github.io/docs/'.$logoName.'.gif';
+		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 */
 	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
-		if(error_reporting() & $errno)
+		if (error_reporting() & $errno)
 			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 	}
 
@@ -191,7 +191,7 @@ 
 	public static function phpFatalErrorHandler()
 	{
 		$error = error_get_last();
-		if($error &&
+		if ($error &&
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type'])
 		{
@@ -210,7 +210,7 @@ 
 	 */
 	public static function exceptionHandler($exception)
 	{
-		if(self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
+		if (self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
 		{
 			$errorHandler->handleError(null, $exception);
 		}
@@ -232,7 +232,7 @@ 
 	 */
 	public static function setApplication($application)
 	{
-		if(self::$_application !== null && !defined('PRADO_TEST_RUN'))
+		if (self::$_application !== null && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_application_singleton_required');
 		self::$_application = $application;
 	}
@@ -261,10 +261,10 @@ 
 
 	protected static function prado3NamespaceToPhpNamespace($type)
 	{
-		if(substr($type, 0, 6) === 'System')
-			$type = 'Prado' . substr($type, 6);
+		if (substr($type, 0, 6) === 'System')
+			$type = 'Prado'.substr($type, 6);
 
-		if(false === strpos($type, '\\'))
+		if (false === strpos($type, '\\'))
 			return str_replace('.', '\\', $type);
 		else
 			return $type;
@@ -286,10 +286,10 @@ 
 	public static function createComponent($requestedType)
 	{
 		$type = static::prado3NamespaceToPhpNamespace($requestedType);
-		if(!isset(self::$classExists[$type]))
+		if (!isset(self::$classExists[$type]))
 			self::$classExists[$type] = class_exists($type, false);
 
-		if(!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
+		if (!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			static::using($type);
 			self::$classExists[$type] = class_exists($type, false);
 		}
@@ -301,13 +301,13 @@ 
 		 * \Application\Common\MyDataModule)
 		 * Skip this if the class is inside the Prado\* namespace, since all Prado classes are now namespaced
 		 */
-		if(($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0)
+		if (($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0)
 			$type = substr($type, $pos + 1);
 
-		if(($n = func_num_args()) > 1)
+		if (($n = func_num_args()) > 1)
 		{
 			$args = func_get_args();
-			switch($n) {
+			switch ($n) {
 				case 2:
 					return new $type($args[1]);
 				break;
@@ -322,7 +322,7 @@ 
 				break;
 				default:
 					$s = '$args[1]';
-					for($i = 2;$i < $n;++$i)
+					for ($i = 2; $i < $n; ++$i)
 						$s .= ",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
@@ -346,58 +346,58 @@ 
 	{
 		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
 
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false))
+		if (isset(self::$_usings[$namespace]) || class_exists($namespace, false))
 			return;
 
-		if(array_key_exists($namespace, self::$classMap))
+		if (array_key_exists($namespace, self::$classMap))
 		{
 			// fast autoload a Prado3 class name
 			$phpNamespace = self::$classMap[$namespace];
-			if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
+			if (class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 			{
-				if(!class_exists($namespace) && !interface_exists($namespace))
+				if (!class_exists($namespace) && !interface_exists($namespace))
 					class_alias($phpNamespace, $namespace);
 				return;
 			}
-		} elseif(($pos = strrpos($namespace, '\\')) === false) {
+		} elseif (($pos = strrpos($namespace, '\\')) === false) {
 			// trying to autoload an old class name
-			foreach(self::$_usings as $k => $v)
+			foreach (self::$_usings as $k => $v)
 			{
-				$path = $v . DIRECTORY_SEPARATOR . $namespace . self::CLASS_FILE_EXT;
-				if(file_exists($path))
+				$path = $v.DIRECTORY_SEPARATOR.$namespace.self::CLASS_FILE_EXT;
+				if (file_exists($path))
 				{
-					$phpNamespace = '\\' . $k . '\\' . $namespace;
-					if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
+					$phpNamespace = '\\'.$k.'\\'.$namespace;
+					if (class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 					{
-						if(!class_exists($namespace) && !interface_exists($namespace))
+						if (!class_exists($namespace) && !interface_exists($namespace))
 							class_alias($phpNamespace, $namespace);
 						return;
 					}
 				}
 			}
 
-			if($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false))
+			if ($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false))
 				throw new TInvalidOperationException('prado_component_unknown', $namespace, '');
-		} elseif(($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null) {
+		} elseif (($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null) {
 			$className = substr($namespace, $pos + 1);
-			if($className === '*')  // a directory
+			if ($className === '*')  // a directory
 			{
 				self::$_usings[substr($namespace, 0, $pos)] = $path;
 			}
 			else  // a file
 			{
 				//self::$_usings[$namespace]=$path;
-				if(!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false)))
+				if (!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false)))
 				{
 					try
 					{
 						include_once($path);
-						if(class_exists($namespace, false) || interface_exists($namespace, false))
+						if (class_exists($namespace, false) || interface_exists($namespace, false))
 							class_alias($namespace, $className);
 					}
-					catch(\Exception $e)
+					catch (\Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className, false))
+						if ($checkClassExistence && !class_exists($className, false))
 							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						else
 							throw $e;
@@ -423,20 +423,20 @@ 
 	{
 		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
 
-		if(self::CLASS_FILE_EXT === $ext || empty($ext))
+		if (self::CLASS_FILE_EXT === $ext || empty($ext))
 		{
-			if(isset(self::$_usings[$namespace]))
+			if (isset(self::$_usings[$namespace]))
 				return self::$_usings[$namespace];
 
-			if(isset(self::$_aliases[$namespace]))
+			if (isset(self::$_aliases[$namespace]))
 				return self::$_aliases[$namespace];
 		}
 
 		$segs = explode('\\', $namespace);
 		$alias = array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $segs), '/\\') . (($file === '*') ? '' : DIRECTORY_SEPARATOR . $file . $ext);
+		if (null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
+			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $segs), '/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
 
 		return null;
 	}
@@ -447,7 +447,7 @@ 
 	 */
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ?self::$_aliases[$alias] : null;
 	}
 
 	protected static function getPathAliases()
@@ -463,11 +463,11 @@ 
 	 */
 	public static function setPathOfAlias($alias, $path)
 	{
-		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
+		if (isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_alias_redefined', $alias);
-		elseif(($rp = realpath($path)) !== false && is_dir($rp))
+		elseif (($rp = realpath($path)) !== false && is_dir($rp))
 		{
-			if(strpos($alias, '.') === false)
+			if (strpos($alias, '.') === false)
 				self::$_aliases[$alias] = $rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
@@ -485,45 +485,45 @@ 
 	public static function fatalError($msg)
 	{
 		echo '<h1>Fatal Error</h1>';
-		echo '<p>' . $msg . '</p>';
-		if(!function_exists('debug_backtrace'))
+		echo '<p>'.$msg.'</p>';
+		if (!function_exists('debug_backtrace'))
 			return;
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
 		$index = -1;
-		foreach(debug_backtrace() as $t)
+		foreach (debug_backtrace() as $t)
 		{
 			$index++;
-			if($index == 0)  // hide the backtrace of this function
+			if ($index == 0)  // hide the backtrace of this function
 				continue;
-			echo '#' . $index . ' ';
-			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
+			echo '#'.$index.' ';
+			if (isset($t['file']))
+				echo basename($t['file']).':'.$t['line'];
 			else
 				 echo '<PHP inner-code>';
 			echo ' -- ';
-			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
-			echo $t['function'] . '(';
-			if(isset($t['args']) && count($t['args']) > 0)
+			if (isset($t['class']))
+				echo $t['class'].$t['type'];
+			echo $t['function'].'(';
+			if (isset($t['args']) && count($t['args']) > 0)
 			{
 				$count = 0;
-				foreach($t['args'] as $item)
+				foreach ($t['args'] as $item)
 				{
-					if(is_string($item))
+					if (is_string($item))
 					{
 						$str = htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
 						if (strlen($item) > 70)
-							echo "'" . substr($str, 0, 70) . "...'";
+							echo "'".substr($str, 0, 70)."...'";
 						else
-							echo "'" . $str . "'";
+							echo "'".$str."'";
 					}
 					elseif (is_int($item) || is_float($item))
 						echo $item;
 					elseif (is_object($item))
 						echo get_class($item);
 					elseif (is_array($item))
-						echo 'array(' . count($item) . ')';
+						echo 'array('.count($item).')';
 					elseif (is_bool($item))
 						echo $item ? 'true' : 'false';
 					elseif ($item === null)
@@ -551,21 +551,21 @@ 
 	public static function getUserLanguages()
 	{
 		static $languages = null;
-		if($languages === null)
+		if ($languages === null)
 		{
-			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+			if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
 				$languages[0] = 'en';
 			else
 			{
 				$languages = [];
-				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+				foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
 					$array = explode(';q=', trim($language));
-					$languages[trim($array[0])] = isset($array[1])?(float)$array[1]:1.0;
+					$languages[trim($array[0])] = isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
 				$languages = array_keys($languages);
-				if(empty($languages))
+				if (empty($languages))
 					$languages[0] = 'en';
 			}
 		}
@@ -579,11 +579,11 @@ 
 	public static function getPreferredLanguage()
 	{
 		static $language = null;
-		if($language === null)
+		if ($language === null)
 		{
 			$langs = Prado::getUserLanguages();
 			$lang = explode('-', $langs[0]);
-			if(empty($lang[0]) || !ctype_alpha($lang[0]))
+			if (empty($lang[0]) || !ctype_alpha($lang[0]))
 				$language = 'en';
 			else
 				$language = $lang[0];
@@ -605,12 +605,12 @@ 
 	 */
 	public static function trace($msg, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_application && self::$_application->getMode() === TApplicationMode::Performance)
+		if (self::$_application && self::$_application->getMode() === TApplicationMode::Performance)
 			return;
-		if(!self::$_application || self::$_application->getMode() === TApplicationMode::Debug)
+		if (!self::$_application || self::$_application->getMode() === TApplicationMode::Debug)
 		{
 			$trace = debug_backtrace();
-			if(isset($trace[0]['file']) && isset($trace[0]['line']))
+			if (isset($trace[0]['file']) && isset($trace[0]['line']))
 				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
 			$level = TLogger::DEBUG;
 		}
@@ -633,7 +633,7 @@ 
 	 */
 	public static function log($msg, $level = TLogger::INFO, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_logger === null)
+		if (self::$_logger === null)
 			self::$_logger = new TLogger;
 		self::$_logger->log($msg, $level, $category, $ctl);
 	}
@@ -643,7 +643,7 @@ 
 	 */
 	public static function getLogger()
 	{
-		if(self::$_logger === null)
+		if (self::$_logger === null)
 			self::$_logger = new TLogger;
 		return self::$_logger;
 	}
@@ -677,15 +677,15 @@ 
 		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = [];
-		foreach($parameters as $key => $value)
-			$params['{' . $key . '}'] = $value;
+		foreach ($parameters as $key => $value)
+			$params['{'.$key.'}'] = $value;
 
 		//no translation handler provided
-		if($app === null || ($config = $app->getTranslationConfiguration()) === null)
+		if ($app === null || ($config = $app->getTranslationConfiguration()) === null)
 			return strtr($text, $params);
 
 		if ($catalogue === null)
-			$catalogue = isset($config['catalogue'])?$config['catalogue']:'messages';
+			$catalogue = isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 
 		Translation::init($catalogue);
 
@@ -696,8 +696,8 @@ 
 		$defaultCharset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if (empty($charset)) $charset = $appCharset;
+		if (empty($charset)) $charset = $defaultCharset;
 
 		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}

Braces +149 added lines, -111 removed lines

@@ -25,13 +25,15 @@ 
 /**
  * Defines the PRADO framework installation path.
  */
-if(!defined('PRADO_DIR'))
+if(!defined('PRADO_DIR')) {
 	define('PRADO_DIR', __DIR__);
+}
 /**
  * Defines the default permission for writable directories and files
  */
-if(!defined('PRADO_CHMOD'))
+if(!defined('PRADO_CHMOD')) {
 	define('PRADO_CHMOD', 0777);
+}
 /**
  * Defines the Composer's vendor/ path.
  */
@@ -160,9 +162,9 @@ 
 		{
 			$am = self::$_application->getAssetManager();
 			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\' . $logoName, '.gif'));
+		} else {
+					$url = 'http://pradosoft.github.io/docs/' . $logoName . '.gif';
 		}
-		else
-			$url = 'http://pradosoft.github.io/docs/' . $logoName . '.gif';
 		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="' . $url . '" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
 
@@ -178,8 +180,9 @@ 
 	 */
 	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
-		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
+		if(error_reporting() & $errno) {
+					throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
+		}
 	}
 
 	/**
@@ -213,8 +216,7 @@ 
 		if(self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
 		{
 			$errorHandler->handleError(null, $exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -232,8 +234,9 @@ 
 	 */
 	public static function setApplication($application)
 	{
-		if(self::$_application !== null && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_application_singleton_required');
+		if(self::$_application !== null && !defined('PRADO_TEST_RUN')) {
+					throw new TInvalidOperationException('prado_application_singleton_required');
+		}
 		self::$_application = $application;
 	}
 
@@ -261,13 +264,15 @@ 
 
 	protected static function prado3NamespaceToPhpNamespace($type)
 	{
-		if(substr($type, 0, 6) === 'System')
-			$type = 'Prado' . substr($type, 6);
+		if(substr($type, 0, 6) === 'System') {
+					$type = 'Prado' . substr($type, 6);
+		}
 
-		if(false === strpos($type, '\\'))
-			return str_replace('.', '\\', $type);
-		else
-			return $type;
+		if(false === strpos($type, '\\')) {
+					return str_replace('.', '\\', $type);
+		} else {
+					return $type;
+		}
 	}
 
 	/**
@@ -286,8 +291,9 @@ 
 	public static function createComponent($requestedType)
 	{
 		$type = static::prado3NamespaceToPhpNamespace($requestedType);
-		if(!isset(self::$classExists[$type]))
-			self::$classExists[$type] = class_exists($type, false);
+		if(!isset(self::$classExists[$type])) {
+					self::$classExists[$type] = class_exists($type, false);
+		}
 
 		if(!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			static::using($type);
@@ -301,8 +307,9 @@ 
 		 * \Application\Common\MyDataModule)
 		 * Skip this if the class is inside the Prado\* namespace, since all Prado classes are now namespaced
 		 */
-		if(($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0)
-			$type = substr($type, $pos + 1);
+		if(($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0) {
+					$type = substr($type, $pos + 1);
+		}
 
 		if(($n = func_num_args()) > 1)
 		{
@@ -322,15 +329,16 @@ 
 				break;
 				default:
 					$s = '$args[1]';
-					for($i = 2;$i < $n;++$i)
-						$s .= ",\$args[$i]";
+					for($i = 2;$i < $n;++$i) {
+											$s .= ",\$args[$i]";
+					}
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
 			}
+		} else {
+					return new $type;
 		}
-		else
-			return new $type;
 	}
 
 	/**
@@ -346,8 +354,9 @@ 
 	{
 		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
 
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false))
-			return;
+		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false)) {
+					return;
+		}
 
 		if(array_key_exists($namespace, self::$classMap))
 		{
@@ -355,8 +364,9 @@ 
 			$phpNamespace = self::$classMap[$namespace];
 			if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 			{
-				if(!class_exists($namespace) && !interface_exists($namespace))
-					class_alias($phpNamespace, $namespace);
+				if(!class_exists($namespace) && !interface_exists($namespace)) {
+									class_alias($phpNamespace, $namespace);
+				}
 				return;
 			}
 		} elseif(($pos = strrpos($namespace, '\\')) === false) {
@@ -369,22 +379,25 @@ 
 					$phpNamespace = '\\' . $k . '\\' . $namespace;
 					if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 					{
-						if(!class_exists($namespace) && !interface_exists($namespace))
-							class_alias($phpNamespace, $namespace);
+						if(!class_exists($namespace) && !interface_exists($namespace)) {
+													class_alias($phpNamespace, $namespace);
+						}
 						return;
 					}
 				}
 			}
 
-			if($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false))
-				throw new TInvalidOperationException('prado_component_unknown', $namespace, '');
+			if($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false)) {
+							throw new TInvalidOperationException('prado_component_unknown', $namespace, '');
+			}
 		} elseif(($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null) {
 			$className = substr($namespace, $pos + 1);
-			if($className === '*')  // a directory
+			if($className === '*') {
+				// a directory
 			{
 				self::$_usings[substr($namespace, 0, $pos)] = $path;
 			}
-			else  // a file
+			} else  // a file
 			{
 				//self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false)))
@@ -392,15 +405,16 @@ 
 					try
 					{
 						include_once($path);
-						if(class_exists($namespace, false) || interface_exists($namespace, false))
-							class_alias($namespace, $className);
-					}
-					catch(\Exception $e)
+						if(class_exists($namespace, false) || interface_exists($namespace, false)) {
+													class_alias($namespace, $className);
+						}
+					} catch(\Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className, false))
-							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
-						else
-							throw $e;
+						if($checkClassExistence && !class_exists($className, false)) {
+													throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
+						} else {
+													throw $e;
+						}
 					}
 				}
 			}
@@ -425,18 +439,21 @@ 
 
 		if(self::CLASS_FILE_EXT === $ext || empty($ext))
 		{
-			if(isset(self::$_usings[$namespace]))
-				return self::$_usings[$namespace];
+			if(isset(self::$_usings[$namespace])) {
+							return self::$_usings[$namespace];
+			}
 
-			if(isset(self::$_aliases[$namespace]))
-				return self::$_aliases[$namespace];
+			if(isset(self::$_aliases[$namespace])) {
+							return self::$_aliases[$namespace];
+			}
 		}
 
 		$segs = explode('\\', $namespace);
 		$alias = array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $segs), '/\\') . (($file === '*') ? '' : DIRECTORY_SEPARATOR . $file . $ext);
+		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias))) {
+					return rtrim($root . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $segs), '/\\') . (($file === '*') ? '' : DIRECTORY_SEPARATOR . $file . $ext);
+		}
 
 		return null;
 	}
@@ -463,17 +480,18 @@ 
 	 */
 	public static function setPathOfAlias($alias, $path)
 	{
-		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined', $alias);
-		elseif(($rp = realpath($path)) !== false && is_dir($rp))
+		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN')) {
+					throw new TInvalidOperationException('prado_alias_redefined', $alias);
+		} elseif(($rp = realpath($path)) !== false && is_dir($rp))
 		{
-			if(strpos($alias, '.') === false)
-				self::$_aliases[$alias] = $rp;
-			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
+			if(strpos($alias, '.') === false) {
+							self::$_aliases[$alias] = $rp;
+			} else {
+							throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
+			}
+		} else {
+					throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 		}
-		else
-			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
 	/**
@@ -486,24 +504,29 @@ 
 	{
 		echo '<h1>Fatal Error</h1>';
 		echo '<p>' . $msg . '</p>';
-		if(!function_exists('debug_backtrace'))
-			return;
+		if(!function_exists('debug_backtrace')) {
+					return;
+		}
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
 		$index = -1;
 		foreach(debug_backtrace() as $t)
 		{
 			$index++;
-			if($index == 0)  // hide the backtrace of this function
+			if($index == 0) {
+				// hide the backtrace of this function
 				continue;
+			}
 			echo '#' . $index . ' ';
-			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
-			else
-				 echo '<PHP inner-code>';
+			if(isset($t['file'])) {
+							echo basename($t['file']) . ':' . $t['line'];
+			} else {
+							 echo '<PHP inner-code>';
+			}
 			echo ' -- ';
-			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
+			if(isset($t['class'])) {
+							echo $t['class'] . $t['type'];
+			}
 			echo $t['function'] . '(';
 			if(isset($t['args']) && count($t['args']) > 0)
 			{
@@ -513,26 +536,28 @@ 
 					if(is_string($item))
 					{
 						$str = htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
-							echo "'" . substr($str, 0, 70) . "...'";
-						else
-							echo "'" . $str . "'";
+						if (strlen($item) > 70) {
+													echo "'" . substr($str, 0, 70) . "...'";
+						} else {
+													echo "'" . $str . "'";
+						}
+					} elseif (is_int($item) || is_float($item)) {
+											echo $item;
+					} elseif (is_object($item)) {
+											echo get_class($item);
+					} elseif (is_array($item)) {
+											echo 'array(' . count($item) . ')';
+					} elseif (is_bool($item)) {
+											echo $item ? 'true' : 'false';
+					} elseif ($item === null) {
+											echo 'NULL';
+					} elseif (is_resource($item)) {
+											echo get_resource_type($item);
 					}
-					elseif (is_int($item) || is_float($item))
-						echo $item;
-					elseif (is_object($item))
-						echo get_class($item);
-					elseif (is_array($item))
-						echo 'array(' . count($item) . ')';
-					elseif (is_bool($item))
-						echo $item ? 'true' : 'false';
-					elseif ($item === null)
-						echo 'NULL';
-					elseif (is_resource($item))
-						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
-						echo ', ';
+					if (count($t['args']) > $count) {
+											echo ', ';
+					}
 				}
 			}
 			echo ")\n";
@@ -553,9 +578,9 @@ 
 		static $languages = null;
 		if($languages === null)
 		{
-			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-				$languages[0] = 'en';
-			else
+			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+							$languages[0] = 'en';
+			} else
 			{
 				$languages = [];
 				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
@@ -565,8 +590,9 @@ 
 				}
 				arsort($languages);
 				$languages = array_keys($languages);
-				if(empty($languages))
-					$languages[0] = 'en';
+				if(empty($languages)) {
+									$languages[0] = 'en';
+				}
 			}
 		}
 		return $languages;
@@ -583,10 +609,11 @@ 
 		{
 			$langs = Prado::getUserLanguages();
 			$lang = explode('-', $langs[0]);
-			if(empty($lang[0]) || !ctype_alpha($lang[0]))
-				$language = 'en';
-			else
-				$language = $lang[0];
+			if(empty($lang[0]) || !ctype_alpha($lang[0])) {
+							$language = 'en';
+			} else {
+							$language = $lang[0];
+			}
 		}
 		return $language;
 	}
@@ -605,17 +632,19 @@ 
 	 */
 	public static function trace($msg, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_application && self::$_application->getMode() === TApplicationMode::Performance)
-			return;
+		if(self::$_application && self::$_application->getMode() === TApplicationMode::Performance) {
+					return;
+		}
 		if(!self::$_application || self::$_application->getMode() === TApplicationMode::Debug)
 		{
 			$trace = debug_backtrace();
-			if(isset($trace[0]['file']) && isset($trace[0]['line']))
-				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
+			if(isset($trace[0]['file']) && isset($trace[0]['line'])) {
+							$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
+			}
 			$level = TLogger::DEBUG;
+		} else {
+					$level = TLogger::INFO;
 		}
-		else
-			$level = TLogger::INFO;
 		self::log($msg, $level, $category, $ctl);
 	}
 
@@ -633,8 +662,9 @@ 
 	 */
 	public static function log($msg, $level = TLogger::INFO, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_logger === null)
-			self::$_logger = new TLogger;
+		if(self::$_logger === null) {
+					self::$_logger = new TLogger;
+		}
 		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 
@@ -643,8 +673,9 @@ 
 	 */
 	public static function getLogger()
 	{
-		if(self::$_logger === null)
-			self::$_logger = new TLogger;
+		if(self::$_logger === null) {
+					self::$_logger = new TLogger;
+		}
 		return self::$_logger;
 	}
 
@@ -677,15 +708,18 @@ 
 		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = [];
-		foreach($parameters as $key => $value)
-			$params['{' . $key . '}'] = $value;
+		foreach($parameters as $key => $value) {
+					$params['{' . $key . '}'] = $value;
+		}
 
 		//no translation handler provided
-		if($app === null || ($config = $app->getTranslationConfiguration()) === null)
-			return strtr($text, $params);
+		if($app === null || ($config = $app->getTranslationConfiguration()) === null) {
+					return strtr($text, $params);
+		}
 
-		if ($catalogue === null)
-			$catalogue = isset($config['catalogue'])?$config['catalogue']:'messages';
+		if ($catalogue === null) {
+					$catalogue = isset($config['catalogue'])?$config['catalogue']:'messages';
+		}
 
 		Translation::init($catalogue);
 
@@ -696,8 +730,12 @@ 
 		$defaultCharset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if(empty($charset)) {
+			$charset = $appCharset;
+		}
+		if(empty($charset)) {
+			$charset = $defaultCharset;
+		}
 
 		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}

framework/Web/Javascripts/TJavaScriptString.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
 {
 	public function toJavaScriptLiteral()
 	{
-		return TJavaScript::jsonEncode((string)$this->_s, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
+		return TJavaScript::jsonEncode((string) $this->_s, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TCallbackErrorHandler.php

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,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);

Spacing +5 added lines, -5 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	protected function displayException($exception)
 	{
-		if($this->getApplication()->getMode() === TApplicationMode::Debug)
+		if ($this->getApplication()->getMode() === TApplicationMode::Debug)
 		{
 			$response = $this->getApplication()->getResponse();
 			$trace = $this->getExceptionStackTrace($exception);
@@ -63,7 +63,7 @@ 
 		}
 		else
 		{
-			error_log("Error happened while processing an existing error:\n" . $exception->__toString());
+			error_log("Error happened while processing an existing error:\n".$exception->__toString());
 			header('HTTP/1.0 500 Internal Server Error', true, 500);
 		}
 		$this->getApplication()->getResponse()->flush();
@@ -79,11 +79,11 @@ 
 		$data['file'] = $exception->getFile();
 		$data['line'] = $exception->getLine();
 		$data['trace'] = $exception->getTrace();
-		if($exception instanceof TPhpErrorException)
+		if ($exception instanceof TPhpErrorException)
 		{
 			// if PHP exception, we want to show the 2nd stack level context
 			// because the 1st stack level is of little use (it's in error handler)
-			if(isset($trace[0]) && isset($trace[0]['file']) && isset($trace[0]['line']))
+			if (isset($trace[0]) && isset($trace[0]['file']) && isset($trace[0]['line']))
 			{
 				$data['file'] = $trace[0]['file'];
 				$data['line'] = $trace[0]['line'];
@@ -91,7 +91,7 @@ 
 		}
 		$data['type'] = get_class($exception);
 		$data['message'] = $exception->getMessage();
-		$data['version'] = $_SERVER['SERVER_SOFTWARE'] . ' ' . Prado::getVersion();
+		$data['version'] = $_SERVER['SERVER_SOFTWARE'].' '.Prado::getVersion();
 		$data['time'] = @strftime('%Y-%m-%d %H:%M', time());
 		return $data;
 	}