pradosoft / prado

framework/Web/THttpResponse.php

Spacing +94 added lines, -94 removed lines

@@ -66,13 +66,13 @@ 
  */
 class THttpResponse extends \Prado\TModule implements \Prado\IO\ITextWriter
 {
-	const DEFAULT_CONTENTTYPE = 'text/html';
-	const DEFAULT_CHARSET = 'UTF-8';
+	const DEFAULT_CONTENTTYPE='text/html';
+	const DEFAULT_CHARSET='UTF-8';
 
 	/**
 	 * @var The differents defined status code by RFC 2616 {@link http://www.faqs.org/rfcs/rfc2616}
 	 */
-	private static $HTTP_STATUS_CODES = [
+	private static $HTTP_STATUS_CODES=[
 		100 => 'Continue', 101 => 'Switching Protocols',
 		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content',
 		300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect',
@@ -83,11 +83,11 @@ 
 	/**
 	 * @var boolean whether to buffer output
 	 */
-	private $_bufferOutput = true;
+	private $_bufferOutput=true;
 	/**
 	 * @var boolean if the application is initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var THttpCookieCollection list of cookies to return
 	 */
@@ -95,15 +95,15 @@ 
 	/**
 	 * @var integer response status code
 	 */
-	private $_status = 200;
+	private $_status=200;
 	/**
 	 * @var string reason correspond to status code
 	 */
-	private $_reason = 'OK';
+	private $_reason='OK';
 	/**
 	 * @var string HTML writer type
 	 */
-	private $_htmlWriterType = '\Prado\Web\UI\THtmlWriter';
+	private $_htmlWriterType='\Prado\Web\UI\THtmlWriter';
 	/**
 	 * @var string content type
 	 */
@@ -111,7 +111,7 @@ 
 	/**
 	 * @var string|boolean character set, e.g. UTF-8 or false if no character set should be send to client
 	 */
-	private $_charset = '';
+	private $_charset='';
 	/**
 	 * @var THttpResponseAdapter adapter.
 	 */
@@ -140,7 +140,7 @@ 
 	 */
 	public function setAdapter(THttpResponseAdapter $adapter)
 	{
-		$this->_adapter = $adapter;
+		$this->_adapter=$adapter;
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	public function getHasAdapter()
 	{
-		return $this->_adapter !== null;
+		return $this->_adapter!==null;
 	}
 
 	/**
@@ -169,7 +169,7 @@ 
 	{
 		if($this->_bufferOutput)
 			ob_start();
-		$this->_initialized = true;
+		$this->_initialized=true;
 		$this->getApplication()->setResponse($this);
 	}
 
@@ -203,7 +203,7 @@ 
 	 */
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value, ['none','nocache','private','private_no_expire','public']));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, ['none', 'nocache', 'private', 'private_no_expire', 'public']));
 	}
 
 	/**
@@ -211,9 +211,9 @@ 
 	 */
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
+		if($this->_contentTypeHeaderSent)
 			throw new \Exception('Unable to alter content-type as it has been already sent');
-		$this->_contentType = $type;
+		$this->_contentType=$type;
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset=(strToLower($charset)==='false') ? false : (string) $charset;
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
 		else
-			$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
+			$this->_bufferOutput=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -276,24 +276,24 @@ 
 	 * @param integer HTTP status code
 	 * @param string HTTP status reason, defaults to standard HTTP reasons
 	 */
-	public function setStatusCode($status, $reason = null)
+	public function setStatusCode($status, $reason=null)
 	{
-		if ($this->_httpHeaderSent)
+		if($this->_httpHeaderSent)
 			throw new \Exception('Unable to alter response as HTTP header already sent');
-		$status = TPropertyValue::ensureInteger($status);
+		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
-			$this->_reason = self::$HTTP_STATUS_CODES[$status];
-		}else{
-			if($reason === null || $reason === '') {
+			$this->_reason=self::$HTTP_STATUS_CODES[$status];
+		} else {
+			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
-			$reason = TPropertyValue::ensureString($reason);
-			if(strpos($reason, "\r") != false || strpos($reason, "\n") != false) {
+			$reason=TPropertyValue::ensureString($reason);
+			if(strpos($reason, "\r")!=false || strpos($reason, "\n")!=false) {
 				throw new TInvalidDataValueException("response_status_reason_barchars");
 			}
-			$this->_reason = $reason;
+			$this->_reason=$reason;
 		}
-		$this->_status = $status;
+		$this->_status=$status;
 	}
 
 	/**
@@ -308,8 +308,8 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies === null)
-			$this->_cookies = new THttpCookieCollection($this);
+		if($this->_cookies===null)
+			$this->_cookies=new THttpCookieCollection($this);
 		return $this->_cookies;
 	}
 
@@ -321,7 +321,7 @@ 
 	public function write($str)
 	{
 		// when starting output make sure we send the headers first
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
+		if(!$this->_bufferOutput and !$this->_httpHeaderSent)
 			$this->ensureHeadersSent();
 		echo $str;
 	}
@@ -338,9 +338,9 @@ 
 	 * @param integer size of file or content in bytes if already known. Defaults to 'null' means auto-detect.
 	 * @throws TInvalidDataValueException if the file cannot be found
 	 */
-	public function writeFile($fileName, $content = null, $mimeType = null, $headers = null, $forceDownload = true, $clientFileName = null, $fileSize = null)
+	public function writeFile($fileName, $content=null, $mimeType=null, $headers=null, $forceDownload=true, $clientFileName=null, $fileSize=null)
 	{
-		static $defaultMimeTypes = [
+		static $defaultMimeTypes=[
 			'css' => 'text/css',
 			'gif' => 'image/gif',
 			'png' => 'image/png',
@@ -353,26 +353,26 @@ 
 			'xls' => 'application/vnd.ms-excel',
 		];
 
-		if($mimeType === null)
+		if($mimeType===null)
 		{
-			$mimeType = 'text/plain';
+			$mimeType='text/plain';
 			if(function_exists('mime_content_type'))
-				$mimeType = mime_content_type($fileName);
-			elseif(($ext = strrchr($fileName, '.')) !== false)
+				$mimeType=mime_content_type($fileName);
+			elseif(($ext=strrchr($fileName, '.'))!==false)
 			{
-				$ext = substr($ext, 1);
+				$ext=substr($ext, 1);
 				if(isset($defaultMimeTypes[$ext]))
-					$mimeType = $defaultMimeTypes[$ext];
+					$mimeType=$defaultMimeTypes[$ext];
 			}
 		}
 
-		if($clientFileName === null)
-			$clientFileName = basename($fileName);
+		if($clientFileName===null)
+			$clientFileName=basename($fileName);
 		else
-			$clientFileName = basename($clientFileName);
+			$clientFileName=basename($clientFileName);
 
-		if($fileSize === null || $fileSize < 0)
-			$fileSize = ($content === null?filesize($fileName):strlen($content));
+		if($fileSize===null || $fileSize < 0)
+			$fileSize=($content===null ?filesize($fileName) : strlen($content));
 
 		$this->sendHttpHeader();
 		if(is_array($headers))
@@ -386,13 +386,13 @@ 
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header("Content-Type: $mimeType");
-			$this->_contentTypeHeaderSent = true;
+			$this->_contentTypeHeaderSent=true;
 		}
 
-		header('Content-Length: ' . $fileSize);
-		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
+		header('Content-Length: '.$fileSize);
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
-		if($content === null)
+		if($content===null)
 			readfile($fileName);
 		else
 			echo $content;
@@ -430,25 +430,25 @@ 
 
 		// Under IIS, explicitly send an HTTP response including the status code
 		// this is handled automatically by PHP on Apache and others
-		$isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false);
-		if($url[0] === '/')
-			$url = $this->getRequest()->getBaseUrl() . $url;
-		if ($this->_status >= 300 && $this->_status < 400)
+		$isIIS=(stripos($this->getRequest()->getServerSoftware(), "microsoft-iis")!==false);
+		if($url[0]==='/')
+			$url=$this->getRequest()->getBaseUrl().$url;
+		if($this->_status >= 300 && $this->_status < 400)
 		{
 			// The status code has been modified to a valid redirection status, send it
 			if($isIIS)
 			{
-				header('HTTP/1.1 ' . $this->_status . ' ' . self::$HTTP_STATUS_CODES[
+				header('HTTP/1.1 '.$this->_status.' '.self::$HTTP_STATUS_CODES[
 					array_key_exists($this->_status, self::$HTTP_STATUS_CODES)
 						? $this->_status
 						: 302
 					]);
 			}
-			header('Location: ' . str_replace('&amp;', '&', $url), true, $this->_status);
+			header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
 		} else {
 			if($isIIS)
-				header('HTTP/1.1 302 ' . self::$HTTP_STATUS_CODES[302]);
-			header('Location: ' . str_replace('&amp;', '&', $url));
+				header('HTTP/1.1 302 '.self::$HTTP_STATUS_CODES[302]);
+			header('Location: '.str_replace('&amp;', '&', $url));
 		}
 
 		if(!$this->getApplication()->getRequestCompleted())
@@ -470,7 +470,7 @@ 
 	/**
 	 * Flush the response contents and headers.
 	 */
-	public function flush($continueBuffering = true)
+	public function flush($continueBuffering=true)
 	{
 		if($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
@@ -492,18 +492,18 @@ 
 	 * This method is used internally. Please use {@link flush} instead.
 	 * @param boolean whether to continue buffering after flush if buffering was active
 	 */
-	public function flushContent($continueBuffering = true)
+	public function flushContent($continueBuffering=true)
 	{
 		Prado::trace("Flushing output", 'Prado\Web\THttpResponse');
 		$this->ensureHeadersSent();
 		if($this->_bufferOutput)
 		{
 			// avoid forced send of http headers (ob_flush() does that) if there's no output yet
-			if (ob_get_length() > 0)
+			if(ob_get_length() > 0)
 			{
-				if (!$continueBuffering)
+				if(!$continueBuffering)
 				{
-					$this->_bufferOutput = false;
+					$this->_bufferOutput=false;
 					ob_end_flush();
 				}
 				else
@@ -520,7 +520,7 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
+		if(!$this->_httpHeaderSent)
 			$this->sendHttpHeader();
 	}
 
@@ -529,13 +529,13 @@ 
 	 */
 	protected function sendHttpHeader()
 	{
-		$protocol = $this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
-			$protocol = 'HTTP/1.1';
+		$protocol=$this->getRequest()->getHttpProtocolVersion();
+		if($this->getRequest()->getHttpProtocolVersion()===null)
+			$protocol='HTTP/1.1';
 
-		header($protocol . ' ' . $this->_status . ' ' . $this->_reason, true, TPropertyValue::ensureInteger($this->_status));
+		header($protocol.' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
-		$this->_httpHeaderSent = true;
+		$this->_httpHeaderSent=true;
 	}
 
 	/**
@@ -543,7 +543,7 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
+		if(!$this->_contentTypeHeaderSent)
 			$this->sendContentTypeHeader();
 	}
 
@@ -552,20 +552,20 @@ 
 	 */
 	protected function sendContentTypeHeader()
 	{
-		$contentType = $this->_contentType === null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
-		$charset = $this->getCharset();
-		if($charset === false) {
-			$this->appendHeader('Content-Type: ' . $contentType);
+		$contentType=$this->_contentType===null ?self::DEFAULT_CONTENTTYPE : $this->_contentType;
+		$charset=$this->getCharset();
+		if($charset===false) {
+			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
 
-		if($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null)
-			$charset = $globalization->getCharset();
+		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
+			$charset=$globalization->getCharset();
 
-		if($charset === '') $charset = self::DEFAULT_CHARSET;
-		$this->appendHeader('Content-Type: ' . $contentType . ';charset=' . $charset);
+		if($charset==='') $charset=self::DEFAULT_CHARSET;
+		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
 
-		$this->_contentTypeHeaderSent = true;
+		$this->_contentTypeHeaderSent=true;
 	}
 
 	/**
@@ -577,7 +577,7 @@ 
 	public function getContents()
 	{
 		Prado::trace("Retrieving output", 'Prado\Web\THttpResponse');
-		return $this->_bufferOutput?ob_get_contents():'';
+		return $this->_bufferOutput ?ob_get_contents() : '';
 	}
 
 	/**
@@ -594,21 +594,21 @@ 
 	 * @param integer|null Either {@link CASE_UPPER} or {@link CASE_LOWER} or as is null (default)
 	 * @return array
 	 */
-	public function getHeaders($case = null)
+	public function getHeaders($case=null)
 	{
-		$result = [];
-		$headers = headers_list();
+		$result=[];
+		$headers=headers_list();
 		foreach($headers as $header) {
-			$tmp = explode(':', $header);
-			$key = trim(array_shift($tmp));
-			$value = trim(implode(':', $tmp));
+			$tmp=explode(':', $header);
+			$key=trim(array_shift($tmp));
+			$value=trim(implode(':', $tmp));
 			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
+				$result[$key].=', '.$value;
 			else
-				$result[$key] = $value;
+				$result[$key]=$value;
 		}
 
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -619,7 +619,7 @@ 
 	 * @param string header
 	 * @param boolean whether the header should replace a previous similar header, or add a second header of the same type
 	 */
-	public function appendHeader($value, $replace = true)
+	public function appendHeader($value, $replace=true)
 	{
 		Prado::trace("Sending header '$value'", 'Prado\Web\THttpResponse');
 		header($value, $replace);
@@ -634,7 +634,7 @@ 
 	 * @param string The extra headers. It's used when the message parameter is set to 1. This message type uses the same internal function as mail() does.
 	 * @see http://us2.php.net/manual/en/function.error-log.php
 	 */
-	public function appendLog($message, $messageType = 0, $destination = '', $extraHeaders = '')
+	public function appendLog($message, $messageType=0, $destination='', $extraHeaders='')
 	{
 		error_log($message, $messageType, $destination, $extraHeaders);
 	}
@@ -646,10 +646,10 @@ 
 	 */
 	public function addCookie($cookie)
 	{
-		$request = $this->getRequest();
+		$request=$this->getRequest();
 		if($request->getEnableCookieValidation())
 		{
-			$value = $this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
+			$value=$this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
 			setcookie(
 				$cookie->getName(),
 				$value,
@@ -704,7 +704,7 @@ 
 	 */
 	public function setHtmlWriterType($value)
 	{
-		$this->_htmlWriterType = $value;
+		$this->_htmlWriterType=$value;
 	}
 
 	/**
@@ -712,10 +712,10 @@ 
 	 * If the type of the HTML writer is not supplied, {@link getHtmlWriterType HtmlWriterType} will be assumed.
 	 * @param string type of the HTML writer to be created. If null, {@link getHtmlWriterType HtmlWriterType} will be assumed.
 	 */
-	public function createHtmlWriter($type = null)
+	public function createHtmlWriter($type=null)
 	{
-		if($type === null)
-			$type = $this->getHtmlWriterType();
+		if($type===null)
+			$type=$this->getHtmlWriterType();
 		if($this->getHasAdapter())
 			return $this->_adapter->createNewHtmlWriter($type, $this);
 		else

framework/Web/Services/TJsonResponse.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
  */
 abstract class TJsonResponse extends \Prado\TApplicationComponent
 {
-	private $_id = '';
+	private $_id='';
 
 	/**
 	 * Initializes the feed.
@@ -49,7 +49,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**

framework/Web/Services/TPageService.php

Spacing +85 added lines, -85 removed lines

@@ -81,31 +81,31 @@ 
 	/**
 	 * Configuration file name
 	 */
-	const CONFIG_FILE_XML = 'config.xml';
+	const CONFIG_FILE_XML='config.xml';
 	/**
 	 * Configuration file name
 	 */
-	const CONFIG_FILE_PHP = 'config.php';
+	const CONFIG_FILE_PHP='config.php';
 	/**
 	 * Default base path
 	 */
-	const DEFAULT_BASEPATH = 'Pages';
+	const DEFAULT_BASEPATH='Pages';
 	/**
 	 * Fallback base path - used to be the default up to Prado < 3.2
 	 */
-	const FALLBACK_BASEPATH = 'pages';
+	const FALLBACK_BASEPATH='pages';
 	/**
 	 * Prefix of ID used for storing parsed configuration in cache
 	 */
-	const CONFIG_CACHE_PREFIX = 'prado:pageservice:';
+	const CONFIG_CACHE_PREFIX='prado:pageservice:';
 	/**
 	 * Page template file extension
 	 */
-	const PAGE_FILE_EXT = '.page';
+	const PAGE_FILE_EXT='.page';
 	/**
 	 * Prefix of Pages used for instantiating new pages
 	 */
-	const PAGE_NAMESPACE_PREFIX = 'Application\\Pages\\';
+	const PAGE_NAMESPACE_PREFIX='Application\\Pages\\';
 	/**
 	 * @var string root path of pages
 	 */
@@ -113,16 +113,16 @@ 
 	/**
 	 * @var string base path class in namespace format
 	 */
-	private $_basePageClass = '\Prado\Web\UI\TPage';
+	private $_basePageClass='\Prado\Web\UI\TPage';
 	/**
 	 * @var string clientscript manager class in namespace format
 	 * @since 3.1.7
 	 */
-	private $_clientScriptManagerClass = '\Prado\Web\UI\TClientScriptManager';
+	private $_clientScriptManagerClass='\Prado\Web\UI\TClientScriptManager';
 	/**
 	 * @var string default page
 	 */
-	private $_defaultPage = 'Home';
+	private $_defaultPage='Home';
 	/**
 	 * @var string requested page (path)
 	 */
@@ -134,11 +134,11 @@ 
 	/**
 	 * @var array list of initial page property values
 	 */
-	private $_properties = [];
+	private $_properties=[];
 	/**
 	 * @var boolean whether service is initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var TThemeManager theme manager
 	 */
@@ -157,11 +157,11 @@ 
 	{
 		Prado::trace("Initializing TPageService", '\Prado\Web\Services\TPageService');
 
-		$pageConfig = $this->loadPageConfig($config);
+		$pageConfig=$this->loadPageConfig($config);
 
 		$this->initPageContext($pageConfig);
 
-		$this->_initialized = true;
+		$this->_initialized=true;
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	protected function initPageContext($pageConfig)
 	{
-		$application = $this->getApplication();
+		$application=$this->getApplication();
 		foreach($pageConfig->getApplicationConfigurations() as $appConfig)
 			$application->applyConfiguration($appConfig);
 
@@ -187,20 +187,20 @@ 
 	protected function applyConfiguration($config)
 	{
 		// initial page properties (to be set when page runs)
-		$this->_properties = array_merge($this->_properties, $config->getProperties());
+		$this->_properties=array_merge($this->_properties, $config->getProperties());
 		$this->getApplication()->getAuthorizationRules()->mergeWith($config->getRules());
-		$pagePath = $this->getRequestedPagePath();
+		$pagePath=$this->getRequestedPagePath();
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath => $params)
 		{
-			list($configPagePath, $condition) = $params;
-			if($condition !== true)
-				$condition = $this->evaluateExpression($condition);
+			list($configPagePath, $condition)=$params;
+			if($condition!==true)
+				$condition=$this->evaluateExpression($condition);
 			if($condition)
 			{
-				if(($path = Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt())) === null || !is_file($path))
+				if(($path=Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
 					throw new TConfigurationException('pageservice_includefile_invalid', $filePath);
-				$c = new TPageConfiguration($pagePath);
+				$c=new TPageConfiguration($pagePath);
 				$c->loadFromFile($path, $configPagePath);
 				$this->applyConfiguration($c);
 			}
@@ -214,9 +214,9 @@ 
 	 */
 	protected function determineRequestedPagePath()
 	{
-		$pagePath = $this->getRequest()->getServiceParameter();
+		$pagePath=$this->getRequest()->getServiceParameter();
 		if(empty($pagePath))
-			$pagePath = $this->getDefaultPage();
+			$pagePath=$this->getDefaultPage();
 		return $pagePath;
 	}
 
@@ -227,14 +227,14 @@ 
 	 */
 	protected function loadPageConfig($config)
 	{
-		$application = $this->getApplication();
-		$pagePath = $this->getRequestedPagePath();
-		if(($cache = $application->getCache()) === null)
+		$application=$this->getApplication();
+		$pagePath=$this->getRequestedPagePath();
+		if(($cache=$application->getCache())===null)
 		{
-			$pageConfig = new TPageConfiguration($pagePath);
-			if($config !== null)
+			$pageConfig=new TPageConfiguration($pagePath);
+			if($config!==null)
 			{
-				if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 				else
 					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
@@ -243,61 +243,61 @@ 
 		}
 		else
 		{
-			$configCached = true;
-			$currentTimestamp = [];
-			$arr = $cache->get(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath);
+			$configCached=true;
+			$currentTimestamp=[];
+			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);
 			if(is_array($arr))
 			{
-				list($pageConfig, $timestamps) = $arr;
-				if($application->getMode() !== TApplicationMode::Performance)
+				list($pageConfig, $timestamps)=$arr;
+				if($application->getMode()!==TApplicationMode::Performance)
 				{
 					foreach($timestamps as $fileName => $timestamp)
 					{
-						if($fileName === 0) // application config file
+						if($fileName===0) // application config file
 						{
-							$appConfigFile = $application->getConfigurationFile();
-							$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
+							$appConfigFile=$application->getConfigurationFile();
+							$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 							if($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
-								$configCached = false;
+								$configCached=false;
 						}
 						else
 						{
-							$currentTimestamp[$fileName] = @filemtime($fileName);
+							$currentTimestamp[$fileName]=@filemtime($fileName);
 							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
-								$configCached = false;
+								$configCached=false;
 						}
 					}
 				}
 			}
 			else
 			{
-				$configCached = false;
-				$paths = explode('.', $pagePath);
-				$configPath = $this->getBasePath();
-				$fileName = $this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
+				$configCached=false;
+				$paths=explode('.', $pagePath);
+				$configPath=$this->getBasePath();
+				$fileName=$this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 					? self::CONFIG_FILE_PHP
 					: self::CONFIG_FILE_XML;
 				foreach($paths as $path)
 				{
-					$configFile = $configPath . DIRECTORY_SEPARATOR . $fileName;
-					$currentTimestamp[$configFile] = @filemtime($configFile);
-					$configPath .= DIRECTORY_SEPARATOR . $path;
+					$configFile=$configPath.DIRECTORY_SEPARATOR.$fileName;
+					$currentTimestamp[$configFile]=@filemtime($configFile);
+					$configPath.=DIRECTORY_SEPARATOR.$path;
 				}
-				$appConfigFile = $application->getConfigurationFile();
-				$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
+				$appConfigFile=$application->getConfigurationFile();
+				$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 			}
 			if(!$configCached)
 			{
-				$pageConfig = new TPageConfiguration($pagePath);
-				if($config !== null)
+				$pageConfig=new TPageConfiguration($pagePath);
+				if($config!==null)
 				{
-					if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 						$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 					else
 						$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
-				$cache->set(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath, [$pageConfig,$currentTimestamp]);
+				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath, [$pageConfig, $currentTimestamp]);
 			}
 		}
 		return $pageConfig;
@@ -310,7 +310,7 @@ 
 	{
 		if(!$this->_templateManager)
 		{
-			$this->_templateManager = new TTemplateManager;
+			$this->_templateManager=new TTemplateManager;
 			$this->_templateManager->init(null);
 		}
 		return $this->_templateManager;
@@ -321,7 +321,7 @@ 
 	 */
 	public function setTemplateManager(TTemplateManager $value)
 	{
-		$this->_templateManager = $value;
+		$this->_templateManager=$value;
 	}
 
 	/**
@@ -331,7 +331,7 @@ 
 	{
 		if(!$this->_themeManager)
 		{
-			$this->_themeManager = new TThemeManager;
+			$this->_themeManager=new TThemeManager;
 			$this->_themeManager->init(null);
 		}
 		return $this->_themeManager;
@@ -342,7 +342,7 @@ 
 	 */
 	public function setThemeManager(TThemeManager $value)
 	{
-		$this->_themeManager = $value;
+		$this->_themeManager=$value;
 	}
 
 	/**
@@ -350,9 +350,9 @@ 
 	 */
 	public function getRequestedPagePath()
 	{
-		if($this->_pagePath === null)
+		if($this->_pagePath===null)
 		{
-			$this->_pagePath = strtr($this->determineRequestedPagePath(), '/\\', '..');
+			$this->_pagePath=strtr($this->determineRequestedPagePath(), '/\\', '..');
 			if(empty($this->_pagePath))
 				throw new THttpException(404, 'pageservice_page_required');
 		}
@@ -384,7 +384,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
 		else
-			$this->_defaultPage = $value;
+			$this->_defaultPage=$value;
 	}
 
 	/**
@@ -400,13 +400,13 @@ 
 	 */
 	public function getBasePath()
 	{
-		if($this->_basePath === null)
+		if($this->_basePath===null)
 		{
-			$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-			if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
+			$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
+			if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
 			{
-				$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::FALLBACK_BASEPATH;
-				if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
+				$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::FALLBACK_BASEPATH;
+				if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
 					throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
 			}
 		}
@@ -421,9 +421,9 @@ 
 	{
 		if($this->_initialized)
 			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
-		elseif(($path = Prado::getPathOfNamespace($value)) === null || !is_dir($path))
+		elseif(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path))
 			throw new TConfigurationException('pageservice_basepath_invalid', $value);
-		$this->_basePath = realpath($path);
+		$this->_basePath=realpath($path);
 	}
 
 	/**
@@ -434,7 +434,7 @@ 
 	 */
 	public function setBasePageClass($value)
 	{
-		$this->_basePageClass = $value;
+		$this->_basePageClass=$value;
 	}
 
 	/**
@@ -452,7 +452,7 @@ 
 	 */
 	public function setClientScriptManagerClass($value)
 	{
-		$this->_clientScriptManagerClass = $value;
+		$this->_clientScriptManagerClass=$value;
 	}
 
 	/**
@@ -472,7 +472,7 @@ 
 	public function run()
 	{
 		Prado::trace("Running page service", 'Prado\Web\Services\TPageService');
-		$this->_page = $this->createPage($this->getRequestedPagePath());
+		$this->_page=$this->createPage($this->getRequestedPagePath());
 		$this->runPage($this->_page, $this->_properties);
 	}
 
@@ -485,40 +485,40 @@ 
 	 */
 	protected function createPage($pagePath)
 	{
-		$path = $this->getBasePath() . DIRECTORY_SEPARATOR . strtr($pagePath, '.', DIRECTORY_SEPARATOR);
-		$hasTemplateFile = is_file($path . self::PAGE_FILE_EXT);
-		$hasClassFile = is_file($path . Prado::CLASS_FILE_EXT);
+		$path=$this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath, '.', DIRECTORY_SEPARATOR);
+		$hasTemplateFile=is_file($path.self::PAGE_FILE_EXT);
+		$hasClassFile=is_file($path.Prado::CLASS_FILE_EXT);
 
 		if(!$hasTemplateFile && !$hasClassFile)
 			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
 		if($hasClassFile)
 		{
-			$className = basename($path);
-			$namespacedClassName = static::PAGE_NAMESPACE_PREFIX . str_replace('.', '\\', $pagePath);
+			$className=basename($path);
+			$namespacedClassName=static::PAGE_NAMESPACE_PREFIX.str_replace('.', '\\', $pagePath);
 
 			if(!class_exists($className, false) && !class_exists($namespacedClassName, false))
-				include_once($path . Prado::CLASS_FILE_EXT);
+				include_once($path.Prado::CLASS_FILE_EXT);
 
 			if(!class_exists($className, false))
-				$className = $namespacedClassName;
+				$className=$namespacedClassName;
 		}
 		else
 		{
-			$className = $this->getBasePageClass();
+			$className=$this->getBasePageClass();
 			Prado::using($className);
-			if(($pos = strrpos($className, '.')) !== false)
-				$className = substr($className, $pos + 1);
+			if(($pos=strrpos($className, '.'))!==false)
+				$className=substr($className, $pos + 1);
 		}
 
-		if($className !== '\Prado\Web\UI\TPage' && !is_subclass_of($className, '\Prado\Web\UI\TPage'))
+		if($className!=='\Prado\Web\UI\TPage' && !is_subclass_of($className, '\Prado\Web\UI\TPage'))
 			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
-		$page = Prado::createComponent($className);
+		$page=Prado::createComponent($className);
 		$page->setPagePath($pagePath);
 
 		if($hasTemplateFile)
-			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path . self::PAGE_FILE_EXT));
+			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
 
 		return $page;
 	}
@@ -543,7 +543,7 @@ 
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
 	 * @return string URL for the page and GET parameters
 	 */
-	public function constructUrl($pagePath, $getParams = null, $encodeAmpersand = true, $encodeGetItems = true)
+	public function constructUrl($pagePath, $getParams=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
 		return $this->getRequest()->constructUrl($this->getID(), $pagePath, $getParams, $encodeAmpersand, $encodeGetItems);
 	}

framework/Web/Services/TRpcService.php

Spacing +24 added lines, -24 removed lines

@@ -63,17 +63,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 = [
+	protected $protocolHandlers=[
 		'application/json' => 'TJsonRpcProtocol',
 		'text/xml' => 'TXmlRpcProtocol'
 	];
@@ -81,7 +81,7 @@ 
 	/**
 	 * @var array containing API provider and their configured properties
 	 */
-	protected $apiProviders = [];
+	protected $apiProviders=[];
 
 	// methods
 
@@ -92,27 +92,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;
-		if($_rpcServerClassName !== self::BASE_RPC_SERVER && !is_subclass_of($_rpcServerClassName, self::BASE_RPC_SERVER))
+		$_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)
@@ -138,15 +138,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;
 		}
 	}
 
@@ -155,26 +155,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')
-			throw new THttpException(405, 'Invalid request method "' . $_method . '"!'); // TODO Exception muss "Allow POST" Header setzen
+		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);
 		}

framework/Web/Services/TFeedService.php

Spacing +16 added lines, -16 removed lines

@@ -64,7 +64,7 @@ 
  */
 class TFeedService extends \Prado\TService
 {
-	private $_feeds = [];
+	private $_feeds=[];
 
 	/**
 	 * Initializes this module.
@@ -73,20 +73,20 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			if(is_array($config))
 			{
 				foreach($config as $id => $feed)
-					$this->_feeds[$id] = $feed;
+					$this->_feeds[$id]=$feed;
 			}
 		}
 		else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
-				if(($id = $feed->getAttributes()->remove('id')) !== null)
-					$this->_feeds[$id] = $feed;
+				if(($id=$feed->getAttributes()->remove('id'))!==null)
+					$this->_feeds[$id]=$feed;
 				else
 					throw new TConfigurationException('feedservice_id_required');
 			}
@@ -107,19 +107,19 @@ 
 	 */
 	public function run()
 	{
-		$id = $this->getRequest()->getServiceParameter();
+		$id=$this->getRequest()->getServiceParameter();
 		if(isset($this->_feeds[$id]))
 		{
-			$feedConfig = $this->_feeds[$id];
-			$properties = [];
-			$feed = null;
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+			$feedConfig=$this->_feeds[$id];
+			$properties=[];
+			$feed=null;
+			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
 				if(isset($feedConfig['class']))
 				{
-					$feed = Prado::createComponent($feedConfig['class']);
+					$feed=Prado::createComponent($feedConfig['class']);
 					if($service instanceof IFeedContentProvider)
-						$properties = isset($feedConfig['properties'])?$feedConfig['properties']:[];
+						$properties=isset($feedConfig['properties']) ? $feedConfig['properties'] : [];
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
@@ -128,10 +128,10 @@ 
 			}
 			else
 			{
-				$properties = $feedConfig->getAttributes();
-				if(($class = $properties->remove('class')) !== null)
+				$properties=$feedConfig->getAttributes();
+				if(($class=$properties->remove('class'))!==null)
 				{
-					$feed = Prado::createComponent($class);
+					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
 						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
 				}
@@ -144,7 +144,7 @@ 
 				$feed->setSubproperty($name, $value);
 			$feed->init($feedConfig);
 
-			$content = $feed->getFeedContent();
+			$content=$feed->getFeedContent();
 			//$this->getResponse()->setContentType('application/rss+xml');
 			$this->getResponse()->setContentType($feed->getContentType());
 			$this->getResponse()->write($content);

framework/Web/Services/TJsonRpcProtocol.php

Spacing +15 added lines, -15 removed lines

@@ -27,7 +27,7 @@ 
 class TJsonRpcProtocol extends TRpcProtocol
 {
 	protected $_id;
-	protected $_specificationVersion = 1.0;
+	protected $_specificationVersion=1.0;
 
 	/**
 	 * Handles the RPC request
@@ -38,33 +38,33 @@ 
 	{
 		try
 		{
-			$_request = $this->decode($requestPayload);
+			$_request=$this->decode($requestPayload);
 
 			if(isset($_request['jsonrpc']))
 			{
-				$this->_specificationVersion = $_request['jsonrpc'];
+				$this->_specificationVersion=$_request['jsonrpc'];
 				if($this->_specificationVersion > 2.0)
 					throw new TRpcException('Unsupported specification version', '-32600');
 			}
 
 			if(isset($_request['id']))
-				$this->_id = $_request['id'];
+				$this->_id=$_request['id'];
 
 			if(!isset($_request['method']))
 					throw new TRpcException('Missing request method', '-32600');
 
 			if(!isset($_request['params']))
-				$parameters = [];
+				$parameters=[];
 			else
-				$parameters = $_request['params'];
+				$parameters=$_request['params'];
 
 			if(!is_array($parameters))
-				$parameters = [$parameters];
+				$parameters=[$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)
+				if($this->_specificationVersion==2.0)
 				{
 					return $this->encode([
 						'jsonrpc' => '2.0',
@@ -101,7 +101,7 @@ 
 	 */
 	public function createErrorResponse(TRpcException $exception)
 	{
-		if($this->_specificationVersion == 2.0)
+		if($this->_specificationVersion==2.0)
 		{
 			return $this->encode([
 				'id' => $this->_id,
@@ -141,7 +141,7 @@ 
 	 */
 	public function decode($data)
 	{
-		$s = json_decode($data, true);
+		$s=json_decode($data, true);
 		self::checkJsonError();
 		return $s;
 	}
@@ -153,15 +153,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);
 	}
 
@@ -175,7 +175,7 @@ 
 	public function callApiMethod($methodName, $parameters)
 	{
 		if(!isset($this->rpcMethods[$methodName]))
-			throw new TRpcException('Method "' . $methodName . '" not found', '-32601');
+			throw new TRpcException('Method "'.$methodName.'" not found', '-32601');
 
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}

framework/Web/Services/TSoapService.php

Spacing +31 added lines, -31 removed lines

@@ -96,10 +96,10 @@ 
  */
 class TSoapService extends \Prado\TService
 {
-	const DEFAULT_SOAP_SERVER = 'Prado\Web\Services\TSoapServer';
-	private $_servers = [];
+	const DEFAULT_SOAP_SERVER='Prado\Web\Services\TSoapServer';
+	private $_servers=[];
 	private $_configFile;
-	private $_wsdlRequest = false;
+	private $_wsdlRequest=false;
 	private $_serverID;
 
 	/**
@@ -119,11 +119,11 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_configFile !== null)
+		if($this->_configFile!==null)
 		{
 			if(is_file($this->_configFile))
 			{
-				$dom = new TXmlDocument;
+				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadConfig($dom);
 			}
@@ -144,15 +144,15 @@ 
 	 */
 	protected function resolveRequest()
 	{
-		$serverID = $this->getRequest()->getServiceParameter();
-		if(($pos = strrpos($serverID, '.wsdl')) === strlen($serverID) - 5)
+		$serverID=$this->getRequest()->getServiceParameter();
+		if(($pos=strrpos($serverID, '.wsdl'))===strlen($serverID) - 5)
 		{
-			$serverID = substr($serverID, 0, $pos);
-			$this->_wsdlRequest = true;
+			$serverID=substr($serverID, 0, $pos);
+			$this->_wsdlRequest=true;
 		}
 		else
-			$this->_wsdlRequest = false;
-		$this->_serverID = $serverID;
+			$this->_wsdlRequest=false;
+		$this->_serverID=$serverID;
 		if(!isset($this->_servers[$serverID]))
 			throw new THttpException(400, 'soapservice_request_invalid', $serverID);
 	}
@@ -164,16 +164,16 @@ 
 	 */
 	private function loadConfig($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			if(is_array($config))
 			{
 				foreach($config['soap'] as $id => $server)
 				{
-					$properties = isset($server['properties'])?$server['properties']:[];
+					$properties=isset($server['properties']) ? $server['properties'] : [];
 					if(isset($this->_servers[$id]))
 						throw new TConfigurationException('soapservice_serverid_duplicated', $id);
-					$this->_servers[$id] = $properties;
+					$this->_servers[$id]=$properties;
 				}
 			}
 		}
@@ -181,12 +181,12 @@ 
 		{
 			foreach($config->getElementsByTagName('soap') as $serverXML)
 			{
-				$properties = $serverXML->getAttributes();
-				if(($id = $properties->remove('id')) === null)
+				$properties=$serverXML->getAttributes();
+				if(($id=$properties->remove('id'))===null)
 					throw new TConfigurationException('soapservice_serverid_required');
 				if(isset($this->_servers[$id]))
 					throw new TConfigurationException('soapservice_serverid_duplicated', $id);
-				$this->_servers[$id] = $properties;
+				$this->_servers[$id]=$properties;
 			}
 		}
 	}
@@ -206,7 +206,7 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile = Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt())) === null)
+		if(($this->_configFile=Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt()))===null)
 			throw new TConfigurationException('soapservice_configfile_invalid', $value);
 	}
 
@@ -218,7 +218,7 @@ 
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
 	 * @return string URL for the page and GET parameters
 	 */
-	public function constructUrl($serverID, $getParams = null, $encodeAmpersand = true, $encodeGetItems = true)
+	public function constructUrl($serverID, $getParams=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
 		return $this->getRequest()->constructUrl($this->getID(), $serverID, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
@@ -247,19 +247,19 @@ 
 	 */
 	protected function createServer()
 	{
-		$properties = $this->_servers[$this->_serverID];
-		$serverClass = null;
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP && isset($config['class']))
-			$serverClass = $config['class'];
-		elseif($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_XML)
-			$serverClass = $properties->remove('class');
-		if($serverClass === null)
-			$serverClass = self::DEFAULT_SOAP_SERVER;
+		$properties=$this->_servers[$this->_serverID];
+		$serverClass=null;
+		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP && isset($config['class']))
+			$serverClass=$config['class'];
+		elseif($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_XML)
+			$serverClass=$properties->remove('class');
+		if($serverClass===null)
+			$serverClass=self::DEFAULT_SOAP_SERVER;
 		Prado::using($serverClass);
-		$className = ($pos = strrpos($serverClass, '.')) !== false?substr($serverClass, $pos + 1):$serverClass;
-		if($className !== self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
+		$className=($pos=strrpos($serverClass, '.'))!==false ?substr($serverClass, $pos + 1) : $serverClass;
+		if($className!==self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
 			throw new TConfigurationException('soapservice_server_invalid', $serverClass);
-		$server = new $className;
+		$server=new $className;
 		$server->setID($this->_serverID);
 		foreach($properties as $name => $value)
 			$server->setSubproperty($name, $value);
@@ -275,7 +275,7 @@ 
 	public function run()
 	{
 		Prado::trace("Running SOAP service", 'Prado\Web\Services\TSoapService');
-		$server = $this->createServer();
+		$server=$this->createServer();
 		$this->getResponse()->setContentType('text/xml');
 		$this->getResponse()->setCharset($server->getEncoding());
 		if($this->getIsWsdlRequest())

framework/Web/Services/TSoapServer.php

Spacing +55 added lines, -55 removed lines

@@ -31,18 +31,18 @@ 
  */
 class TSoapServer extends \Prado\TApplicationComponent
 {
-	const WSDL_CACHE_PREFIX = 'wsdl.';
+	const WSDL_CACHE_PREFIX='wsdl.';
 
 	private $_id;
 	private $_provider;
 
-	private $_version = '';
-	private $_actor = '';
-	private $_encoding = '';
-	private $_uri = '';
+	private $_version='';
+	private $_actor='';
+	private $_encoding='';
+	private $_uri='';
 	private $_classMap;
-	private $_persistent = false;
-	private $_wsdlUri = '';
+	private $_persistent=false;
+	private $_wsdlUri='';
 
 	private $_requestedMethod;
 
@@ -62,9 +62,9 @@ 
 	 */
 	public function setID($id)
 	{
-		if(strrpos($this->_id, '.wsdl') === strlen($this->_id) - 5)
+		if(strrpos($this->_id, '.wsdl')===strlen($this->_id) - 5)
 			throw new TInvalidDataValueException('soapserver_id_invalid', $id);
-		$this->_id = $id;
+		$this->_id=$id;
 	}
 
 	/**
@@ -72,25 +72,25 @@ 
 	 */
 	public function run()
 	{
-		if(($provider = $this->getProvider()) !== null)
+		if(($provider=$this->getProvider())!==null)
 		{
 			Prado::using($provider);
-			$providerClass = ($pos = strrpos($provider, '.')) !== false?substr($provider, $pos + 1):$provider;
+			$providerClass=($pos=strrpos($provider, '.'))!==false ?substr($provider, $pos + 1) : $provider;
 			$this->guessMethodCallRequested($providerClass);
-			$server = $this->createServer();
+			$server=$this->createServer();
 			$server->setClass($providerClass, $this);
 			if($this->_persistent)
 				$server->setPersistence(SOAP_PERSISTENCE_SESSION);
 		}
 		else
-			$server = $this->createServer();
+			$server=$this->createServer();
 		try
 		{
 			$server->handle();
 		}
-		catch (\Exception $e)
+		catch(\Exception $e)
 		{
-			if($this->getApplication()->getMode() === TApplicationMode::Debug)
+			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
 			else
 				$this->fault($e->getMessage());
@@ -105,9 +105,9 @@ 
 	 * @param string actors
 	 * @param string message name
 	 */
-	public function fault($title, $details = '', $code = 'SERVER', $actor = '', $name = '')
+	public function fault($title, $details='', $code='SERVER', $actor='', $name='')
 	{
-		Prado::trace('SOAP-Fault ' . $code . ' ' . $title . ' : ' . $details, 'Prado\Web\Services\TSoapService');
+		Prado::trace('SOAP-Fault '.$code.' '.$title.' : '.$details, 'Prado\Web\Services\TSoapService');
 		$this->_server->fault($code, $title, $actor, $details, $name);
 	}
 
@@ -118,14 +118,14 @@ 
 	 */
 	protected function guessMethodCallRequested($class)
 	{
-		$namespace = $class . 'wsdl';
-		$message = file_get_contents("php://input");
-		$matches = [];
-		if(preg_match('/xmlns:([^=]+)="urn:' . $namespace . '"/', $message, $matches))
+		$namespace=$class.'wsdl';
+		$message=file_get_contents("php://input");
+		$matches=[];
+		if(preg_match('/xmlns:([^=]+)="urn:'.$namespace.'"/', $message, $matches))
 		{
-			if(preg_match('/<' . $matches[1] . ':([a-zA-Z_]+[a-zA-Z0-9_]+)/', $message, $method))
+			if(preg_match('/<'.$matches[1].':([a-zA-Z_]+[a-zA-Z0-9_]+)/', $message, $method))
 			{
-				$this->_requestedMethod = $method[1];
+				$this->_requestedMethod=$method[1];
 			}
 		}
 	}
@@ -145,11 +145,11 @@ 
 	 */
 	protected function createServer()
 	{
-		if($this->_server === null)
+		if($this->_server===null)
 		{
-			if($this->getApplication()->getMode() === TApplicationMode::Debug)
+			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				ini_set("soap.wsdl_cache_enabled", 0);
-			$this->_server = new \SoapServer($this->getWsdlUri(), $this->getOptions());
+			$this->_server=new \SoapServer($this->getWsdlUri(), $this->getOptions());
 		}
 		return $this->_server;
 	}
@@ -159,21 +159,21 @@ 
 	 */
 	protected function getOptions()
 	{
-		$options = [];
-		if($this->_version === '1.1')
-			$options['soap_version'] = SOAP_1_1;
-		elseif($this->_version === '1.2')
-			$options['soap_version'] = SOAP_1_2;
+		$options=[];
+		if($this->_version==='1.1')
+			$options['soap_version']=SOAP_1_1;
+		elseif($this->_version==='1.2')
+			$options['soap_version']=SOAP_1_2;
 		if(!empty($this->_actor))
-			$options['actor'] = $this->_actor;
+			$options['actor']=$this->_actor;
 		if(!empty($this->_encoding))
-			$options['encoding'] = $this->_encoding;
+			$options['encoding']=$this->_encoding;
 		if(!empty($this->_uri))
-			$options['uri'] = $this->_uri;
+			$options['uri']=$this->_uri;
 		if(is_string($this->_classMap))
 		{
 			foreach(preg_split('/\s*,\s*/', $this->_classMap) as $className)
-				$options['classmap'][$className] = $className; //complex type uses the class name in the wsdl
+				$options['classmap'][$className]=$className; //complex type uses the class name in the wsdl
 		}
 		return $options;
 	}
@@ -187,18 +187,18 @@ 
 	 */
 	public function getWsdl()
 	{
-		if($this->_wsdlUri === '')
+		if($this->_wsdlUri==='')
 		{
-			$provider = $this->getProvider();
-			$providerClass = ($pos = strrpos($provider, '.')) !== false?substr($provider, $pos + 1):$provider;
+			$provider=$this->getProvider();
+			$providerClass=($pos=strrpos($provider, '.'))!==false ?substr($provider, $pos + 1) : $provider;
 			Prado::using($provider);
-			if($this->getApplication()->getMode() === TApplicationMode::Performance && ($cache = $this->getApplication()->getCache()) !== null)
+			if($this->getApplication()->getMode()===TApplicationMode::Performance && ($cache=$this->getApplication()->getCache())!==null)
 			{
-				$wsdl = $cache->get(self::WSDL_CACHE_PREFIX . $providerClass);
+				$wsdl=$cache->get(self::WSDL_CACHE_PREFIX.$providerClass);
 				if(is_string($wsdl))
 					return $wsdl;
-				$wsdl = WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
-				$cache->set(self::WSDL_CACHE_PREFIX . $providerClass, $wsdl);
+				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
+				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass, $wsdl);
 				return $wsdl;
 			}
 			else
@@ -215,8 +215,8 @@ 
 	 */
 	public function getWsdlUri()
 	{
-		if($this->_wsdlUri === '')
-			return $this->getRequest()->getBaseUrl() . $this->getService()->constructUrl($this->getID() . '.wsdl', false);
+		if($this->_wsdlUri==='')
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl', false);
 		else
 			return $this->_wsdlUri;
 	}
@@ -226,7 +226,7 @@ 
 	 */
 	public function setWsdlUri($value)
 	{
-		$this->_wsdlUri = $value;
+		$this->_wsdlUri=$value;
 	}
 
 	/**
@@ -234,8 +234,8 @@ 
 	 */
 	public function getUri()
 	{
-		if($this->_uri === '')
-			return $this->getRequest()->getBaseUrl() . $this->getService()->constructUrl($this->getID(), false);
+		if($this->_uri==='')
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(), false);
 		else
 			return $this->_uri;
 	}
@@ -245,7 +245,7 @@ 
 	 */
 	public function setUri($uri)
 	{
-		$this->_uri = $uri;
+		$this->_uri=$uri;
 	}
 
 	/**
@@ -261,7 +261,7 @@ 
 	 */
 	public function setProvider($provider)
 	{
-		$this->_provider = $provider;
+		$this->_provider=$provider;
 	}
 
 	/**
@@ -278,8 +278,8 @@ 
 	 */
 	public function setVersion($value)
 	{
-		if($value === '1.1' || $value === '1.2' || $value === '')
-			$this->_version = $value;
+		if($value==='1.1' || $value==='1.2' || $value==='')
+			$this->_version=$value;
 		else
 			throw new TInvalidDataValueException('soapserver_version_invalid', $value);
 	}
@@ -297,7 +297,7 @@ 
 	 */
 	public function setActor($value)
 	{
-		$this->_actor = $value;
+		$this->_actor=$value;
 	}
 
 	/**
@@ -313,7 +313,7 @@ 
 	 */
 	public function setEncoding($value)
 	{
-		$this->_encoding = $value;
+		$this->_encoding=$value;
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	 */
 	public function setSessionPersistent($value)
 	{
-		$this->_persistent = TPropertyValue::ensureBoolean($value);
+		$this->_persistent=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -345,6 +345,6 @@ 
 	 */
 	public function setClassMaps($classes)
 	{
-		$this->_classMap = $classes;
+		$this->_classMap=$classes;
 	}
 }
\ No newline at end of file

framework/Web/Services/TPageConfiguration.php

Spacing +91 added lines, -91 removed lines

@@ -36,23 +36,23 @@ 
 	/**
 	 * @var array list of application configurations
 	 */
-	private $_appConfigs = [];
+	private $_appConfigs=[];
 	/**
 	 * @var array list of page initial property values
 	 */
-	private $_properties = [];
+	private $_properties=[];
 	/**
 	 * @var TAuthorizationRuleCollection list of authorization rules
 	 */
-	private $_rules = [];
+	private $_rules=[];
 	/**
 	 * @var array list of included configurations
 	 */
-	private $_includes = [];
+	private $_includes=[];
 	/**
 	 * @var string the currently request page in the format of Path.To.PageName
 	 */
-	private $_pagePath = '';
+	private $_pagePath='';
 
 	/**
 	 * Constructor.
@@ -60,7 +60,7 @@ 
 	 */
 	public function __construct($pagePath)
 	{
-		$this->_pagePath = $pagePath;
+		$this->_pagePath=$pagePath;
 	}
 
 	/**
@@ -107,24 +107,24 @@ 
 	 */
 	public function loadFromFiles($basePath)
 	{
-		$paths = explode('.', $this->_pagePath);
-		$page = array_pop($paths);
-		$path = $basePath;
-		$configPagePath = '';
-		$fileName = Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
+		$paths=explode('.', $this->_pagePath);
+		$page=array_pop($paths);
+		$path=$basePath;
+		$configPagePath='';
+		$fileName=Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 			? TPageService::CONFIG_FILE_PHP
 			: TPageService::CONFIG_FILE_XML;
 		foreach($paths as $p)
 		{
-			$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
-			$path .= DIRECTORY_SEPARATOR . $p;
-			if($configPagePath === '')
-				$configPagePath = $p;
+			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
+			$path.=DIRECTORY_SEPARATOR.$p;
+			if($configPagePath==='')
+				$configPagePath=$p;
 			else
-				$configPagePath .= '.' . $p;
+				$configPagePath.='.'.$p;
 		}
-		$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
-		$this->_rules = new TAuthorizationRuleCollection($this->_rules);
+		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
+		$this->_rules=new TAuthorizationRuleCollection($this->_rules);
 	}
 
 	/**
@@ -138,14 +138,14 @@ 
 		if(empty($fname) || !is_file($fname))
 			return;
 
-		if(Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
-			$fcontent = include $fname;
+			$fcontent=include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
 		}
 		else
 		{
-			$dom = new TXmlDocument;
+			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))
 				$this->loadFromXml($dom, dirname($fname), $configPagePath);
 			else
@@ -175,9 +175,9 @@ 
 
 	public function loadApplicationConfigurationFromPhp($config, $configPath)
 	{
-		$appConfig = new TApplicationConfiguration;
+		$appConfig=new TApplicationConfiguration;
 		$appConfig->loadFromPhp($config, $configPath);
-		$this->_appConfigs[] = $appConfig;
+		$this->_appConfigs[]=$appConfig;
 	}
 
 	/**
@@ -187,9 +187,9 @@ 
 	 */
 	public function loadApplicationConfigurationFromXml($dom, $configPath)
 	{
-		$appConfig = new TApplicationConfiguration;
+		$appConfig=new TApplicationConfiguration;
 		$appConfig->loadFromXml($dom, $configPath);
-		$this->_appConfigs[] = $appConfig;
+		$this->_appConfigs[]=$appConfig;
 	}
 
 	public function loadPageConfigurationFromPhp($config, $configPath, $configPagePath)
@@ -197,32 +197,32 @@ 
 		// authorization
 		if(isset($config['authorization']) && is_array($config['authorization']))
 		{
-			$rules = [];
+			$rules=[];
 			foreach($config['authorization'] as $authorization)
 			{
-				$patterns = isset($authorization['pages'])?$authorization['pages']:'';
-				$ruleApplies = false;
-				if(empty($patterns) || trim($patterns) === '*') // null or empty string
-					$ruleApplies = true;
+				$patterns=isset($authorization['pages']) ? $authorization['pages'] : '';
+				$ruleApplies=false;
+				if(empty($patterns) || trim($patterns)==='*') // null or empty string
+					$ruleApplies=true;
 				else
 				{
 					foreach(explode(',', $patterns) as $pattern)
 					{
-						if(($pattern = trim($pattern)) !== '')
+						if(($pattern=trim($pattern))!=='')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath !== '')  // prepend the pattern with ConfigPagePath
-								$pattern = $configPagePath . '.' . $pattern;
-							if(strcasecmp($pattern, $this->_pagePath) === 0)
+							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
+								$pattern=$configPagePath.'.'.$pattern;
+							if(strcasecmp($pattern, $this->_pagePath)===0)
 							{
-								$ruleApplies = true;
+								$ruleApplies=true;
 								break;
 							}
-							if($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
+							if($pattern[strlen($pattern) - 1]==='*') // try wildcard matching
 							{
-								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
+								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1)===0)
 								{
-									$ruleApplies = true;
+									$ruleApplies=true;
 									break;
 								}
 							}
@@ -231,40 +231,40 @@ 
 				}
 				if($ruleApplies)
 				{
-					$action = isset($authorization['action'])?$authorization['action']:'';
-					$users = isset($authorization['users'])?$authorization['users']:'';
-					$roles = isset($authorization['roles'])?$authorization['roles']:'';
-					$verb = isset($authorization['verb'])?$authorization['verb']:'';
-					$ips = isset($authorization['ips'])?$authorization['ips']:'';
-					$rules[] = new TAuthorizationRule($action, $users, $roles, $verb, $ips);
+					$action=isset($authorization['action']) ? $authorization['action'] : '';
+					$users=isset($authorization['users']) ? $authorization['users'] : '';
+					$roles=isset($authorization['roles']) ? $authorization['roles'] : '';
+					$verb=isset($authorization['verb']) ? $authorization['verb'] : '';
+					$ips=isset($authorization['ips']) ? $authorization['ips'] : '';
+					$rules[]=new TAuthorizationRule($action, $users, $roles, $verb, $ips);
 				}
 			}
-			$this->_rules = array_merge($rules, $this->_rules);
+			$this->_rules=array_merge($rules, $this->_rules);
 		}
 		// pages
 		if(isset($config['pages']) && is_array($config['pages']))
 		{
 			if(isset($config['pages']['properties']))
 			{
-				$this->_properties = array_merge($this->_properties, $config['pages']['properties']);
+				$this->_properties=array_merge($this->_properties, $config['pages']['properties']);
 				unset($config['pages']['properties']);
 			}
 			foreach($config['pages'] as $id => $page)
 			{
-				$properties = [];
+				$properties=[];
 				if(isset($page['properties']))
 				{
-					$properties = $page['properties'];
+					$properties=$page['properties'];
 					unset($page['properties']);
 				}
-				$matching = false;
-				$id = ($configPagePath === '')?$id:$configPagePath . '.' . $id;
-				if(strcasecmp($id, $this->_pagePath) === 0)
-					$matching = true;
-				elseif($id[strlen($id) - 1] === '*') // try wildcard matching
-					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
+				$matching=false;
+				$id=($configPagePath==='') ? $id : $configPagePath.'.'.$id;
+				if(strcasecmp($id, $this->_pagePath)===0)
+					$matching=true;
+				elseif($id[strlen($id) - 1]==='*') // try wildcard matching
+					$matching=strncasecmp($this->_pagePath, $id, strlen($id) - 1)===0;
 				if($matching)
-					$this->_properties = array_merge($this->_properties, $properties);
+					$this->_properties=array_merge($this->_properties, $properties);
 			}
 		}
 
@@ -273,14 +273,14 @@ 
 		{
 			foreach($config['includes'] as $include)
 			{
-				$when = isset($include['when'])?true:false;
+				$when=isset($include['when']) ?true:false;
 				if(!isset($include['file']))
 					throw new TConfigurationException('pageserviceconf_includefile_required');
-				$filePath = $include['file'];
+				$filePath=$include['file'];
 				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
+					$this->_includes[$filePath]=[$configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')'];
 				else
-					$this->_includes[$filePath] = [$configPagePath,$when];
+					$this->_includes[$filePath]=[$configPagePath, $when];
 			}
 		}
 	}
@@ -294,34 +294,34 @@ 
 	public function loadPageConfigurationFromXml($dom, $configPath, $configPagePath)
 	{
 		// authorization
-		if(($authorizationNode = $dom->getElementByTagName('authorization')) !== null)
+		if(($authorizationNode=$dom->getElementByTagName('authorization'))!==null)
 		{
-			$rules = [];
+			$rules=[];
 			foreach($authorizationNode->getElements() as $node)
 			{
-				$patterns = $node->getAttribute('pages');
-				$ruleApplies = false;
-				if(empty($patterns) || trim($patterns) === '*') // null or empty string
-					$ruleApplies = true;
+				$patterns=$node->getAttribute('pages');
+				$ruleApplies=false;
+				if(empty($patterns) || trim($patterns)==='*') // null or empty string
+					$ruleApplies=true;
 				else
 				{
 					foreach(explode(',', $patterns) as $pattern)
 					{
-						if(($pattern = trim($pattern)) !== '')
+						if(($pattern=trim($pattern))!=='')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath !== '')  // prepend the pattern with ConfigPagePath
-								$pattern = $configPagePath . '.' . $pattern;
-							if(strcasecmp($pattern, $this->_pagePath) === 0)
+							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
+								$pattern=$configPagePath.'.'.$pattern;
+							if(strcasecmp($pattern, $this->_pagePath)===0)
 							{
-								$ruleApplies = true;
+								$ruleApplies=true;
 								break;
 							}
-							if($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
+							if($pattern[strlen($pattern) - 1]==='*') // try wildcard matching
 							{
-								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
+								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1)===0)
 								{
-									$ruleApplies = true;
+									$ruleApplies=true;
 									break;
 								}
 							}
@@ -329,44 +329,44 @@ 
 					}
 				}
 				if($ruleApplies)
-					$rules[] = new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
+					$rules[]=new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
 			}
-			$this->_rules = array_merge($rules, $this->_rules);
+			$this->_rules=array_merge($rules, $this->_rules);
 		}
 
 		// pages
-		if(($pagesNode = $dom->getElementByTagName('pages')) !== null)
+		if(($pagesNode=$dom->getElementByTagName('pages'))!==null)
 		{
-			$this->_properties = array_merge($this->_properties, $pagesNode->getAttributes()->toArray());
+			$this->_properties=array_merge($this->_properties, $pagesNode->getAttributes()->toArray());
 			// at the page folder
 			foreach($pagesNode->getElementsByTagName('page') as $node)
 			{
-				$properties = $node->getAttributes();
-				$id = $properties->remove('id');
+				$properties=$node->getAttributes();
+				$id=$properties->remove('id');
 				if(empty($id))
 					throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
-				$matching = false;
-				$id = ($configPagePath === '')?$id:$configPagePath . '.' . $id;
-				if(strcasecmp($id, $this->_pagePath) === 0)
-					$matching = true;
-				elseif($id[strlen($id) - 1] === '*') // try wildcard matching
-					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
+				$matching=false;
+				$id=($configPagePath==='') ? $id : $configPagePath.'.'.$id;
+				if(strcasecmp($id, $this->_pagePath)===0)
+					$matching=true;
+				elseif($id[strlen($id) - 1]==='*') // try wildcard matching
+					$matching=strncasecmp($this->_pagePath, $id, strlen($id) - 1)===0;
 				if($matching)
-					$this->_properties = array_merge($this->_properties, $properties->toArray());
+					$this->_properties=array_merge($this->_properties, $properties->toArray());
 			}
 		}
 
 		// external configurations
 		foreach($dom->getElementsByTagName('include') as $node)
 		{
-			if(($when = $node->getAttribute('when')) === null)
-				$when = true;
-			if(($filePath = $node->getAttribute('file')) === null)
+			if(($when=$node->getAttribute('when'))===null)
+				$when=true;
+			if(($filePath=$node->getAttribute('file'))===null)
 				throw new TConfigurationException('pageserviceconf_includefile_required');
 			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
+				$this->_includes[$filePath]=[$configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')'];
 			else
-				$this->_includes[$filePath] = [$configPagePath,$when];
+				$this->_includes[$filePath]=[$configPagePath, $when];
 		}
 	}
 }
\ No newline at end of file