pradosoft / prado

framework/Web/THttpRequest.php

Doc Comments +22 added lines, -1 removed lines

@@ -140,6 +140,7 @@ 
 
 	/**
 	 * @param string id of this module
+	 * @param string $value
 	 */
 	public function setID($value)
 	{
@@ -258,6 +259,7 @@ 
 
 	/**
 	 * Saves the current UrlManager instance to cache.
+	 * @param TUrlManager $manager
 	 * @return boolean true if UrlManager instance was cached, false otherwise.
 	 */
 	protected function cacheUrlManager($manager)
@@ -314,6 +316,7 @@ 
 	 * by loading it as an application module and setting this property
 	 * with the module ID.
 	 * @param string the ID of the URL manager module
+	 * @param string $value
 	 */
 	public function setUrlManager($value)
 	{
@@ -349,7 +352,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequestUrlFormat the format of URLs. Defaults to THttpRequestUrlFormat::Get.
+	 * @return string the format of URLs. Defaults to THttpRequestUrlFormat::Get.
 	 */
 	public function getUrlFormat()
 	{
@@ -379,6 +382,7 @@ 
 
 	/**
 	 * @param string separator used to separate GET variable name and value when URL format is Path.
+	 * @param string $value
 	 * @throws TInvalidDataValueException if the separator is not a single character
 	 */
 	public function setUrlParamSeparator($value)
@@ -620,6 +624,7 @@ 
 
 	/**
 	 * @param boolean whether cookies should be validated.
+	 * @param boolean $value
 	 */
 	public function setEnableCookieValidation($value)
 	{
@@ -710,6 +715,7 @@ 
 	 * @param array GET parameters, null if not needed
 	 * @param boolean whether to encode the ampersand in URL, defaults to true.
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to false.
+	 * @param string $serviceID
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
@@ -915,6 +921,7 @@ 
 	 * Returns whether there is an element at the specified offset.
 	 * This method is required by the interface ArrayAccess.
 	 * @param mixed the offset to check on
+	 * @param integer $offset
 	 * @return boolean
 	 */
 	public function offsetExists($offset)
@@ -926,6 +933,7 @@ 
 	 * Returns the element at the specified offset.
 	 * This method is required by the interface ArrayAccess.
 	 * @param integer the offset to retrieve element.
+	 * @param integer $offset
 	 * @return mixed the element at the offset, null if no element is found at the offset
 	 */
 	public function offsetGet($offset)
@@ -938,6 +946,8 @@ 
 	 * This method is required by the interface ArrayAccess.
 	 * @param integer the offset to set element
 	 * @param mixed the element value
+	 * @param integer $offset
+	 * @param string $item
 	 */
 	public function offsetSet($offset,$item)
 	{
@@ -948,6 +958,7 @@ 
 	 * Unsets the element at the specified offset.
 	 * This method is required by the interface ArrayAccess.
 	 * @param mixed the offset to unset element
+	 * @param integer $offset
 	 */
 	public function offsetUnset($offset)
 	{
@@ -980,6 +991,7 @@ 
 	/**
 	 * Constructor.
 	 * @param mixed owner of this collection.
+	 * @param THttpResponse $owner
 	 */
 	public function __construct($owner=null)
 	{
@@ -992,6 +1004,7 @@ 
 	 * operations for each newly added THttpCookie object.
 	 * @param integer the specified position.
 	 * @param mixed new item
+	 * @param integer $index
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a THttpCookie object.
 	 */
 	public function insertAt($index,$item)
@@ -1011,6 +1024,7 @@ 
 	 * This overrides the parent implementation by performing additional
 	 * cleanup work when removing a TCookie object.
 	 * @param integer the index of the item to be removed.
+	 * @param integer $index
 	 * @return mixed the removed item.
 	 */
 	public function removeAt($index)
@@ -1109,6 +1123,7 @@ 
 
 	/**
 	 * @param string the domain to associate the cookie with
+	 * @param string $value
 	 */
 	public function setDomain($value)
 	{
@@ -1125,6 +1140,7 @@ 
 
 	/**
 	 * @param integer the time the cookie expires. This is a Unix timestamp so is in number of seconds since the epoch.
+	 * @param integer $value
 	 */
 	public function setExpire($value)
 	{
@@ -1157,6 +1173,7 @@ 
 
 	/**
 	 * @param string the name of the cookie
+	 * @param string $value
 	 */
 	public function setName($value)
 	{
@@ -1173,6 +1190,7 @@ 
 
 	/**
 	 * @param string the value of the cookie
+	 * @param string $value
 	 */
 	public function setValue($value)
 	{
@@ -1189,6 +1207,7 @@ 
 
 	/**
 	 * @param string the path on the server in which the cookie will be available on
+	 * @param string $value
 	 */
 	public function setPath($value)
 	{
@@ -1205,6 +1224,7 @@ 
 
 	/**
 	 * @param boolean ether the cookie should only be transmitted over a secure HTTPS connection
+	 * @param boolean $value
 	 */
 	public function setSecure($value)
 	{
@@ -1287,6 +1307,7 @@ 
 	 * Constructor.
 	 * Decomposes the specified URI into parts.
 	 * @param string URI to be represented
+	 * @param string $uri
 	 * @throws TInvalidDataValueException if URI is of bad format
 	 */
 	public function __construct($uri)

Spacing +183 added lines, -183 removed lines

@@ -66,34 +66,34 @@ 
  * @package System.Web
  * @since 3.0
  */
-class THttpRequest extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
+class THttpRequest extends TApplicationComponent implements IteratorAggregate, ArrayAccess, Countable, IModule
 {
-	const CGIFIX__PATH_INFO		= 1;
-	const CGIFIX__SCRIPT_NAME	= 2;
+	const CGIFIX__PATH_INFO = 1;
+	const CGIFIX__SCRIPT_NAME = 2;
 	/**
 	 * @var TUrlManager the URL manager module
 	 */
-	private $_urlManager=null;
+	private $_urlManager = null;
 	/**
 	 * @var string the ID of the URL manager module
 	 */
-	private $_urlManagerID='';
+	private $_urlManagerID = '';
 	/**
 	 * @var string Separator used to separate GET variable name and value when URL format is Path.
 	 */
-	private $_separator=',';
+	private $_separator = ',';
 	/**
 	 * @var string requested service ID
 	 */
-	private $_serviceID=null;
+	private $_serviceID = null;
 	/**
 	 * @var string requested service parameter
 	 */
-	private $_serviceParam=null;
+	private $_serviceParam = null;
 	/**
 	 * @var THttpCookieCollection cookies sent from user
 	 */
-	private $_cookies=null;
+	private $_cookies = null;
 	/**
 	 * @var string requested URI (URL w/o host info)
 	 */
@@ -105,20 +105,20 @@ 
 	/**
 	 * @var boolean whether the session ID should be kept in cookie only
 	 */
-	private $_cookieOnly=null;
-	private $_urlFormat=THttpRequestUrlFormat::Get;
+	private $_cookieOnly = null;
+	private $_urlFormat = THttpRequestUrlFormat::Get;
 	private $_services;
-	private $_requestResolved=false;
-	private $_enableCookieValidation=false;
-	private $_cgiFix=0;
+	private $_requestResolved = false;
+	private $_enableCookieValidation = false;
+	private $_cgiFix = 0;
 	/**
 	 * @var boolean whether to cache the TUrlManager class (useful with a lot of TUrlMappings)
 	 */
-	private $_enableCache=false;
+	private $_enableCache = false;
 	/**
 	 * @var string request URL
 	 */
-	private $_url=null;
+	private $_url = null;
 
 	/**
 	 * @var string module id
@@ -128,7 +128,7 @@ 
 	/**
 	 * @var array contains all request variables
 	 */
-	private $_items=array();
+	private $_items = array();
 
 	/**
 	 * @return string id of this module
@@ -143,7 +143,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 
 	/**
@@ -154,13 +154,13 @@ 
 	public function init($config)
 	{
 		// Fill in default request info when the script is run in command line
-		if(php_sapi_name()==='cli')
+		if (php_sapi_name() === 'cli')
 		{
-			$_SERVER['REMOTE_ADDR']='127.0.0.1';
-			$_SERVER['REQUEST_METHOD']='GET';
-			$_SERVER['SERVER_NAME']='localhost';
-			$_SERVER['SERVER_PORT']=80;
-			$_SERVER['HTTP_USER_AGENT']='';
+			$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+			$_SERVER['REQUEST_METHOD'] = 'GET';
+			$_SERVER['SERVER_NAME'] = 'localhost';
+			$_SERVER['SERVER_PORT'] = 80;
+			$_SERVER['HTTP_USER_AGENT'] = '';
 		}
 
 		// Info about server variables:
@@ -169,30 +169,30 @@ 
 		// QUERY_STRING is the string following the '?' in the ur (eg the a=x part in http://foo/bar?a=x)
 		// REQUEST_URI contains the URI part entered in the browser address bar
 		// SCRIPT_FILENAME is the file path to the executing script
-		if(isset($_SERVER['REQUEST_URI']))
-			$this->_requestUri=$_SERVER['REQUEST_URI'];
+		if (isset($_SERVER['REQUEST_URI']))
+			$this->_requestUri = $_SERVER['REQUEST_URI'];
 		else  // TBD: in this case, SCRIPT_NAME need to be escaped
-			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']);
-
-		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
-			$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
-		elseif(isset($_SERVER['PATH_INFO']))
-			$this->_pathInfo=$_SERVER['PATH_INFO'];
-		else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
+			$this->_requestUri = $_SERVER['SCRIPT_NAME'] . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']);
+
+		if ($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
+			$this->_pathInfo = substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
+		elseif (isset($_SERVER['PATH_INFO']))
+			$this->_pathInfo = $_SERVER['PATH_INFO'];
+		else if (strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME']) === 0 && $_SERVER['PHP_SELF'] !== $_SERVER['SCRIPT_NAME'])
+			$this->_pathInfo = substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
 		else
-			$this->_pathInfo='';
+			$this->_pathInfo = '';
 
-		if(get_magic_quotes_gpc())
+		if (get_magic_quotes_gpc())
 		{
-			if(isset($_GET))
-				$_GET=$this->stripSlashes($_GET);
-			if(isset($_POST))
-				$_POST=$this->stripSlashes($_POST);
-			if(isset($_REQUEST))
-				$_REQUEST=$this->stripSlashes($_REQUEST);
-			if(isset($_COOKIE))
-				$_COOKIE=$this->stripSlashes($_COOKIE);
+			if (isset($_GET))
+				$_GET = $this->stripSlashes($_GET);
+			if (isset($_POST))
+				$_POST = $this->stripSlashes($_POST);
+			if (isset($_REQUEST))
+				$_REQUEST = $this->stripSlashes($_REQUEST);
+			if (isset($_COOKIE))
+				$_COOKIE = $this->stripSlashes($_COOKIE);
 		}
 
 		$this->getApplication()->setRequest($this);
@@ -206,7 +206,7 @@ 
 	 */
 	public function stripSlashes(&$data)
 	{
-		return is_array($data)?array_map(array($this,'stripSlashes'),$data):stripslashes($data);
+		return is_array($data) ? array_map(array($this, 'stripSlashes'), $data) : stripslashes($data);
 	}
 
 	/**
@@ -214,21 +214,21 @@ 
 	 */
 	public function getUrl()
 	{
-		if($this->_url===null)
+		if ($this->_url === null)
 		{
-			$secure=$this->getIsSecureConnection();
-			$url=$secure?'https://':'http://';
-			if(empty($_SERVER['HTTP_HOST']))
+			$secure = $this->getIsSecureConnection();
+			$url = $secure ? 'https://' : 'http://';
+			if (empty($_SERVER['HTTP_HOST']))
 			{
-				$url.=$_SERVER['SERVER_NAME'];
-				$port=$_SERVER['SERVER_PORT'];
-				if(($port!=80 && !$secure) || ($port!=443 && $secure))
-					$url.=':'.$port;
+				$url .= $_SERVER['SERVER_NAME'];
+				$port = $_SERVER['SERVER_PORT'];
+				if (($port != 80 && !$secure) || ($port != 443 && $secure))
+					$url .= ':' . $port;
 			}
 			else
-				$url.=$_SERVER['HTTP_HOST'];
-			$url.=$this->getRequestUri();
-			$this->_url=new TUri($url);
+				$url .= $_SERVER['HTTP_HOST'];
+			$url .= $this->getRequestUri();
+			$this->_url = new TUri($url);
 		}
 		return $this->_url;
 	}
@@ -262,16 +262,16 @@ 
 	 */
 	protected function cacheUrlManager($manager)
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				if ($this->getApplication()->getMode() !== TApplicationMode::Performance)
 					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
 					{
-						$fn = Prado::getPathOfNamespace($fn,$this->getApplication()->getConfigurationFileExt());
+						$fn = Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
 						$dependencies = new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
@@ -286,13 +286,13 @@ 
 	 */
 	protected function loadCachedUrlManager()
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TUrlManager)
+				if ($manager instanceof TUrlManager)
 					return $manager;
 			}
 		}
@@ -317,7 +317,7 @@ 
 	 */
 	public function setUrlManager($value)
 	{
-		$this->_urlManagerID=$value;
+		$this->_urlManagerID = $value;
 	}
 
 	/**
@@ -325,22 +325,22 @@ 
 	 */
 	public function getUrlManagerModule()
 	{
-		if($this->_urlManager===null)
+		if ($this->_urlManager === null)
 		{
-			if(($this->_urlManager = $this->loadCachedUrlManager())===null)
+			if (($this->_urlManager = $this->loadCachedUrlManager()) === null)
 			{
-				if(empty($this->_urlManagerID))
+				if (empty($this->_urlManagerID))
 				{
-					$this->_urlManager=new TUrlManager;
+					$this->_urlManager = new TUrlManager;
 					$this->_urlManager->init(null);
 				}
 				else
 				{
-					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
-					if($this->_urlManager===null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
-					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+					$this->_urlManager = $this->getApplication()->getModule($this->_urlManagerID);
+					if ($this->_urlManager === null)
+						throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
+					if (!($this->_urlManager instanceof TUrlManager))
+						throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -366,7 +366,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat = TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 
 	/**
@@ -383,8 +383,8 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value)===1)
-			$this->_separator=$value;
+		if (strlen($value) === 1)
+			$this->_separator = $value;
 		else
 			throw new TInvalidDataValueException('httprequest_separator_invalid');
 	}
@@ -394,7 +394,7 @@ 
 	 */
 	public function getRequestType()
 	{
-		return isset($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:null;
+		return isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
 	}
 
 	/**
@@ -403,10 +403,10 @@ 
 	 */
 	public function getContentType($mimetypeOnly = true)
 	{
-		if(!isset($_SERVER['CONTENT_TYPE']))
+		if (!isset($_SERVER['CONTENT_TYPE']))
 			return null;
 
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
+		if ($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
 			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
 
 		return $_SERVER['CONTENT_TYPE'];
@@ -417,7 +417,7 @@ 
 	 */
 	public function getIsSecureConnection()
 	{
-			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'],'off');
+			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off');
 	}
 
 	/**
@@ -433,7 +433,7 @@ 
 	 */
 	public function getQueryString()
 	{
-		return isset($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:null;
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 	}
 
 	/**
@@ -441,30 +441,30 @@ 
 	 */
 	public function getHttpProtocolVersion()
 	{
-		return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:null;
+		return isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : null;
 	}
 
 	/**
 	 * @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)
 	{
 		static $result;
 
-		if($result === null && function_exists('apache_request_headers')) {
+		if ($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
 		}
-		elseif($result === null) {
+		elseif ($result === null) {
 			$result = array();
-			foreach($_SERVER as $key=>$value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
-					$key = str_replace(' ','-', ucwords(strtolower(str_replace('_',' ', substr($key, 5)))));
+			foreach ($_SERVER as $key=>$value) {
+				if (strncasecmp($key, 'HTTP_', 5) !== 0) continue;
+					$key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
 					$result[$key] = $value;
 			}
 		}
 
-		if($case !== null)
+		if ($case !== null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -485,13 +485,13 @@ 
 	 * 						false - force http
 	 * @return string schema and hostname of the requested URL
 	 */
-	public function getBaseUrl($forceSecureConnection=null)
+	public function getBaseUrl($forceSecureConnection = null)
 	{
-		$url=$this->getUrl();
-		$scheme=($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
-		$host=$url->getHost();
-		if (($port=$url->getPort())) $host.=':'.$port;
-		return $scheme.'://'.$host;
+		$url = $this->getUrl();
+		$scheme = ($forceSecureConnection) ? "https" : (($forceSecureConnection === null) ? $url->getScheme() : 'http');
+		$host = $url->getHost();
+		if (($port = $url->getPort())) $host .= ':' . $port;
+		return $scheme . '://' . $host;
 	}
 
 	/**
@@ -499,10 +499,10 @@ 
 	 */
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
+		if ($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
 			return $_SERVER['ORIG_SCRIPT_NAME'];
 
-		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
+		return isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : null;
 	}
 
 	/**
@@ -512,7 +512,7 @@ 
 	 * 						false - force http
 	 * @return string entry script URL (w/ host part)
 	 */
-	public function getAbsoluteApplicationUrl($forceSecureConnection=null)
+	public function getAbsoluteApplicationUrl($forceSecureConnection = null)
 	{
 		return $this->getBaseUrl($forceSecureConnection) . $this->getApplicationUrl();
 	}
@@ -522,7 +522,7 @@ 
 	 */
 	public function getApplicationFilePath()
 	{
-		return realpath(isset($_SERVER['SCRIPT_FILENAME'])?$_SERVER['SCRIPT_FILENAME']:null);
+		return realpath(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : null);
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
 	 */
 	public function getServerName()
 	{
-		return isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:null;
+		return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
 	}
 
 	/**
@@ -538,7 +538,7 @@ 
 	 */
 	public function getServerPort()
 	{
-		return isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:null;
+		return isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : null;
 	}
 
 	/**
@@ -546,7 +546,7 @@ 
 	 */
 	public function getUrlReferrer()
 	{
-		return isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:null;
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
 	}
 
 	/**
@@ -559,7 +559,7 @@ 
 		{
 			return get_browser();
 		}
-		catch(TPhpErrorException $e)
+		catch (TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -570,7 +570,7 @@ 
 	 */
 	public function getUserAgent()
 	{
-		return isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:null;
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 	}
 
 	/**
@@ -578,7 +578,7 @@ 
 	 */
 	public function getUserHostAddress()
 	{
-		return isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:null;
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
 	}
 
 	/**
@@ -586,7 +586,7 @@ 
 	 */
 	public function getUserHost()
 	{
-		return isset($_SERVER['REMOTE_HOST'])?$_SERVER['REMOTE_HOST']:null;
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
 	}
 
 	/**
@@ -595,7 +595,7 @@ 
 	public function getAcceptTypes()
 	{
 		// TBD: break it into array??
-		return isset($_SERVER['HTTP_ACCEPT'])?$_SERVER['HTTP_ACCEPT']:null;
+		return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 	}
 
 	/**
@@ -623,7 +623,7 @@ 
 	 */
 	public function setEnableCookieValidation($value)
 	{
-		$this->_enableCookieValidation=TPropertyValue::ensureBoolean($value);
+		$this->_enableCookieValidation = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -643,7 +643,7 @@ 
 	 */
 	public function setCgiFix($value)
 	{
-		$this->_cgiFix=TPropertyValue::ensureInteger($value);
+		$this->_cgiFix = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -651,22 +651,22 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies===null)
+		if ($this->_cookies === null)
 		{
-			$this->_cookies=new THttpCookieCollection;
-			if($this->getEnableCookieValidation())
+			$this->_cookies = new THttpCookieCollection;
+			if ($this->getEnableCookieValidation())
 			{
-				$sm=$this->getApplication()->getSecurityManager();
-				foreach($_COOKIE as $key=>$value)
+				$sm = $this->getApplication()->getSecurityManager();
+				foreach ($_COOKIE as $key=>$value)
 				{
-					if(($value=$sm->validateData($value))!==false)
-						$this->_cookies->add(new THttpCookie($key,$value));
+					if (($value = $sm->validateData($value)) !== false)
+						$this->_cookies->add(new THttpCookie($key, $value));
 				}
 			}
 			else
 			{
-				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+				foreach ($_COOKIE as $key=>$value)
+					$this->_cookies->add(new THttpCookie($key, $value));
 			}
 		}
 		return $this->_cookies;
@@ -713,13 +713,13 @@ 
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serviceID, $serviceParam, $getItems = null, $encodeAmpersand = true, $encodeGetItems = true)
 	{
-		if ($this->_cookieOnly===null)
-				$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
-		$url=$this->getUrlManagerModule()->constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+		if ($this->_cookieOnly === null)
+				$this->_cookieOnly = (int) ini_get('session.use_cookies') && (int) ini_get('session.use_only_cookies');
+		$url = $this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
+		if (defined('SID') && SID != '' && !$this->_cookieOnly)
+			return $url . (strpos($url, '?') === false ? '?' : ($encodeAmpersand ? '&' : '&')) . SID;
 		else
 			return $url;
 	}
@@ -747,15 +747,15 @@ 
 	 */
 	public function resolveRequest($serviceIDs)
 	{
-		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'],'System.Web.THttpRequest');
-		$getParams=$this->parseUrl();
-		foreach($getParams as $name=>$value)
-			$_GET[$name]=$value;
-		$this->_items=array_merge($_GET,$_POST);
-		$this->_requestResolved=true;
-		foreach($serviceIDs as $serviceID)
+		Prado::trace("Resolving request from " . $_SERVER['REMOTE_ADDR'], 'System.Web.THttpRequest');
+		$getParams = $this->parseUrl();
+		foreach ($getParams as $name=>$value)
+			$_GET[$name] = $value;
+		$this->_items = array_merge($_GET, $_POST);
+		$this->_requestResolved = true;
+		foreach ($serviceIDs as $serviceID)
 		{
-			if($this->contains($serviceID))
+			if ($this->contains($serviceID))
 			{
 				$this->setServiceID($serviceID);
 				$this->setServiceParameter($this->itemAt($serviceID));
@@ -787,7 +787,7 @@ 
 	 */
 	public function setServiceID($value)
 	{
-		$this->_serviceID=$value;
+		$this->_serviceID = $value;
 	}
 
 	/**
@@ -804,7 +804,7 @@ 
 	 */
 	public function setServiceParameter($value)
 	{
-		$this->_serviceParam=$value;
+		$this->_serviceParam = $value;
 	}
 
 	//------ The following methods enable THttpRequest to be TMap-like -----
@@ -862,9 +862,9 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		$this->_items[$key]=$value;
+		$this->_items[$key] = $value;
 	}
 
 	/**
@@ -875,9 +875,9 @@ 
 	 */
 	public function remove($key)
 	{
-		if(isset($this->_items[$key]) || array_key_exists($key,$this->_items))
+		if (isset($this->_items[$key]) || array_key_exists($key, $this->_items))
 		{
-			$value=$this->_items[$key];
+			$value = $this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
 		}
@@ -890,7 +890,7 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($this->_items) as $key)
+		foreach (array_keys($this->_items) as $key)
 			$this->remove($key);
 	}
 
@@ -900,7 +900,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return isset($this->_items[$key]) || array_key_exists($key,$this->_items);
+		return isset($this->_items[$key]) || array_key_exists($key, $this->_items);
 	}
 
 	/**
@@ -939,9 +939,9 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 
 	/**
@@ -981,9 +981,9 @@ 
 	 * Constructor.
 	 * @param mixed owner of this collection.
 	 */
-	public function __construct($owner=null)
+	public function __construct($owner = null)
 	{
-		$this->_o=$owner;
+		$this->_o = $owner;
 	}
 
 	/**
@@ -994,12 +994,12 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a THttpCookie object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof THttpCookie)
+		if ($item instanceof THttpCookie)
 		{
-			parent::insertAt($index,$item);
-			if($this->_o instanceof THttpResponse)
+			parent::insertAt($index, $item);
+			if ($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
 		}
 		else
@@ -1015,8 +1015,8 @@ 
 	 */
 	public function removeAt($index)
 	{
-		$item=parent::removeAt($index);
-		if($this->_o instanceof THttpResponse)
+		$item = parent::removeAt($index);
+		if ($this->_o instanceof THttpResponse)
 			$this->_o->removeCookie($item);
 		return $item;
 	}
@@ -1027,7 +1027,7 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if(is_integer($index))
+		if (is_integer($index))
 			return parent::itemAt($index);
 		else
 			return $this->findCookieByName($index);
@@ -1040,8 +1040,8 @@ 
 	 */
 	public function findCookieByName($name)
 	{
-		foreach($this as $cookie)
-			if($cookie->getName()===$name)
+		foreach ($this as $cookie)
+			if ($cookie->getName() === $name)
 				return $cookie;
 		return null;
 	}
@@ -1062,7 +1062,7 @@ 
 	/**
 	 * @var string domain of the cookie
 	 */
-	private $_domain='';
+	private $_domain = '';
 	/**
 	 * @var string name of the cookie
 	 */
@@ -1070,33 +1070,33 @@ 
 	/**
 	 * @var string value of the cookie
 	 */
-	private $_value='';
+	private $_value = '';
 	/**
 	 * @var integer expire of the cookie
 	 */
-	private $_expire=0;
+	private $_expire = 0;
 	/**
 	 * @var string path of the cookie
 	 */
-	private $_path='/';
+	private $_path = '/';
 	/**
 	 * @var boolean whether cookie should be sent via secure connection
 	 */
-	private $_secure=false;
+	private $_secure = false;
 	/**
 	 * @var boolean if true the cookie value will be unavailable to JavaScript
 	 */
-	private $_httpOnly=false;
+	private $_httpOnly = false;
 
 	/**
 	 * Constructor.
 	 * @param string name of this cookie
 	 * @param string value of this cookie
 	 */
-	public function __construct($name,$value)
+	public function __construct($name, $value)
 	{
-		$this->_name=$name;
-		$this->_value=$value;
+		$this->_name = $name;
+		$this->_value = $value;
 	}
 
 	/**
@@ -1112,7 +1112,7 @@ 
 	 */
 	public function setDomain($value)
 	{
-		$this->_domain=$value;
+		$this->_domain = $value;
 	}
 
 	/**
@@ -1128,7 +1128,7 @@ 
 	 */
 	public function setExpire($value)
 	{
-		$this->_expire=TPropertyValue::ensureInteger($value);
+		$this->_expire = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -1160,7 +1160,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->_name=$value;
+		$this->_name = $value;
 	}
 
 	/**
@@ -1176,7 +1176,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value=$value;
+		$this->_value = $value;
 	}
 
 	/**
@@ -1192,7 +1192,7 @@ 
 	 */
 	public function setPath($value)
 	{
-		$this->_path=$value;
+		$this->_path = $value;
 	}
 
 	/**
@@ -1208,7 +1208,7 @@ 
 	 */
 	public function setSecure($value)
 	{
-		$this->_secure=TPropertyValue::ensureBoolean($value);
+		$this->_secure = TPropertyValue::ensureBoolean($value);
 	}
 }
 
@@ -1236,7 +1236,7 @@ 
 	/**
 	 * @var array list of default ports for known schemes
 	 */
-	private static $_defaultPort=array(
+	private static $_defaultPort = array(
 		'ftp'=>21,
 		'gopher'=>70,
 		'http'=>80,
@@ -1291,22 +1291,22 @@ 
 	 */
 	public function __construct($uri)
 	{
-		if(($ret=@parse_url($uri))!==false)
+		if (($ret = @parse_url($uri)) !== false)
 		{
 			// decoding???
-			$this->_scheme=isset($ret['scheme'])?$ret['scheme']:'';
-			$this->_host=isset($ret['host'])?$ret['host']:'';
-			$this->_port=isset($ret['port'])?$ret['port']:'';
-			$this->_user=isset($ret['user'])?$ret['user']:'';
-			$this->_pass=isset($ret['pass'])?$ret['pass']:'';
-			$this->_path=isset($ret['path'])?$ret['path']:'';
-			$this->_query=isset($ret['query'])?$ret['query']:'';
-			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
-			$this->_uri=$uri;
+			$this->_scheme = isset($ret['scheme']) ? $ret['scheme'] : '';
+			$this->_host = isset($ret['host']) ? $ret['host'] : '';
+			$this->_port = isset($ret['port']) ? $ret['port'] : '';
+			$this->_user = isset($ret['user']) ? $ret['user'] : '';
+			$this->_pass = isset($ret['pass']) ? $ret['pass'] : '';
+			$this->_path = isset($ret['path']) ? $ret['path'] : '';
+			$this->_query = isset($ret['query']) ? $ret['query'] : '';
+			$this->_fragment = isset($ret['fragment']) ? $ret['fragment'] : '';
+			$this->_uri = $uri;
 		}
 		else
 		{
-			throw new TInvalidDataValueException('uri_format_invalid',$uri);
+			throw new TInvalidDataValueException('uri_format_invalid', $uri);
 		}
 	}
 
@@ -1399,8 +1399,8 @@ 
  */
 class THttpRequestUrlFormat extends TEnumerable
 {
-	const Get='Get';
-	const Path='Path';
-	const HiddenPath='HiddenPath';
+	const Get = 'Get';
+	const Path = 'Path';
+	const HiddenPath = 'HiddenPath';
 }
 

Braces +109 added lines, -83 removed lines

@@ -169,30 +169,37 @@ 
 		// QUERY_STRING is the string following the '?' in the ur (eg the a=x part in http://foo/bar?a=x)
 		// REQUEST_URI contains the URI part entered in the browser address bar
 		// SCRIPT_FILENAME is the file path to the executing script
-		if(isset($_SERVER['REQUEST_URI']))
-			$this->_requestUri=$_SERVER['REQUEST_URI'];
-		else  // TBD: in this case, SCRIPT_NAME need to be escaped
+		if(isset($_SERVER['REQUEST_URI'])) {
+					$this->_requestUri=$_SERVER['REQUEST_URI'];
+		} else {
+			// TBD: in this case, SCRIPT_NAME need to be escaped
 			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']);
+		}
 
-		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
-			$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
-		elseif(isset($_SERVER['PATH_INFO']))
-			$this->_pathInfo=$_SERVER['PATH_INFO'];
-		else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
-		else
-			$this->_pathInfo='';
+		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO'])) {
+					$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
+		} elseif(isset($_SERVER['PATH_INFO'])) {
+					$this->_pathInfo=$_SERVER['PATH_INFO'];
+		} else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME']) {
+					$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
+		} else {
+					$this->_pathInfo='';
+		}
 
 		if(get_magic_quotes_gpc())
 		{
-			if(isset($_GET))
-				$_GET=$this->stripSlashes($_GET);
-			if(isset($_POST))
-				$_POST=$this->stripSlashes($_POST);
-			if(isset($_REQUEST))
-				$_REQUEST=$this->stripSlashes($_REQUEST);
-			if(isset($_COOKIE))
-				$_COOKIE=$this->stripSlashes($_COOKIE);
+			if(isset($_GET)) {
+							$_GET=$this->stripSlashes($_GET);
+			}
+			if(isset($_POST)) {
+							$_POST=$this->stripSlashes($_POST);
+			}
+			if(isset($_REQUEST)) {
+							$_REQUEST=$this->stripSlashes($_REQUEST);
+			}
+			if(isset($_COOKIE)) {
+							$_COOKIE=$this->stripSlashes($_COOKIE);
+			}
 		}
 
 		$this->getApplication()->setRequest($this);
@@ -222,11 +229,12 @@ 
 			{
 				$url.=$_SERVER['SERVER_NAME'];
 				$port=$_SERVER['SERVER_PORT'];
-				if(($port!=80 && !$secure) || ($port!=443 && $secure))
-					$url.=':'.$port;
+				if(($port!=80 && !$secure) || ($port!=443 && $secure)) {
+									$url.=':'.$port;
+				}
+			} else {
+							$url.=$_SERVER['HTTP_HOST'];
 			}
-			else
-				$url.=$_SERVER['HTTP_HOST'];
 			$url.=$this->getRequestUri();
 			$this->_url=new TUri($url);
 		}
@@ -268,10 +276,11 @@ 
 			if($cache !== null)
 			{
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+				if($this->getApplication()->getMode() !== TApplicationMode::Performance) {
+									if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
 					{
 						$fn = Prado::getPathOfNamespace($fn,$this->getApplication()->getConfigurationFileExt());
+				}
 						$dependencies = new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
@@ -292,8 +301,9 @@ 
 			if($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TUrlManager)
-					return $manager;
+				if($manager instanceof TUrlManager) {
+									return $manager;
+				}
 			}
 		}
 		return null;
@@ -333,14 +343,15 @@ 
 				{
 					$this->_urlManager=new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
-					if($this->_urlManager===null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
-					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+					if($this->_urlManager===null) {
+											throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
+					}
+					if(!($this->_urlManager instanceof TUrlManager)) {
+											throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+					}
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -383,10 +394,11 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value)===1)
-			$this->_separator=$value;
-		else
-			throw new TInvalidDataValueException('httprequest_separator_invalid');
+		if(strlen($value)===1) {
+					$this->_separator=$value;
+		} else {
+					throw new TInvalidDataValueException('httprequest_separator_invalid');
+		}
 	}
 
 	/**
@@ -403,11 +415,13 @@ 
 	 */
 	public function getContentType($mimetypeOnly = true)
 	{
-		if(!isset($_SERVER['CONTENT_TYPE']))
-			return null;
+		if(!isset($_SERVER['CONTENT_TYPE'])) {
+					return null;
+		}
 
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
-			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
+		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false) {
+					return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
+		}
 
 		return $_SERVER['CONTENT_TYPE'];
 	}
@@ -454,18 +468,20 @@ 
 
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = array();
 			foreach($_SERVER as $key=>$value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
+				if(strncasecmp($key, 'HTTP_', 5) !== 0) {
+					continue;
+				}
 					$key = str_replace(' ','-', ucwords(strtolower(str_replace('_',' ', substr($key, 5)))));
 					$result[$key] = $value;
 			}
 		}
 
-		if($case !== null)
-			return array_change_key_case($result, $case);
+		if($case !== null) {
+					return array_change_key_case($result, $case);
+		}
 
 		return $result;
 	}
@@ -490,7 +506,9 @@ 
 		$url=$this->getUrl();
 		$scheme=($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
 		$host=$url->getHost();
-		if (($port=$url->getPort())) $host.=':'.$port;
+		if (($port=$url->getPort())) {
+			$host.=':'.$port;
+		}
 		return $scheme.'://'.$host;
 	}
 
@@ -499,8 +517,9 @@ 
 	 */
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
-			return $_SERVER['ORIG_SCRIPT_NAME'];
+		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME'])) {
+					return $_SERVER['ORIG_SCRIPT_NAME'];
+		}
 
 		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
 	}
@@ -558,8 +577,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -659,14 +677,15 @@ 
 				$sm=$this->getApplication()->getSecurityManager();
 				foreach($_COOKIE as $key=>$value)
 				{
-					if(($value=$sm->validateData($value))!==false)
-						$this->_cookies->add(new THttpCookie($key,$value));
+					if(($value=$sm->validateData($value))!==false) {
+											$this->_cookies->add(new THttpCookie($key,$value));
+					}
 				}
-			}
-			else
+			} else
 			{
-				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+				foreach($_COOKIE as $key=>$value) {
+									$this->_cookies->add(new THttpCookie($key,$value));
+				}
 			}
 		}
 		return $this->_cookies;
@@ -715,13 +734,15 @@ 
 	 */
 	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
 	{
-		if ($this->_cookieOnly===null)
-				$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
+		if ($this->_cookieOnly===null) {
+						$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
+		}
 		$url=$this->getUrlManagerModule()->constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&':'&')) . SID;
-		else
-			return $url;
+		if(defined('SID') && SID != '' && !$this->_cookieOnly) {
+					return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+		} else {
+					return $url;
+		}
 	}
 
 	/**
@@ -749,8 +770,9 @@ 
 	{
 		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'],'System.Web.THttpRequest');
 		$getParams=$this->parseUrl();
-		foreach($getParams as $name=>$value)
-			$_GET[$name]=$value;
+		foreach($getParams as $name=>$value) {
+					$_GET[$name]=$value;
+		}
 		$this->_items=array_merge($_GET,$_POST);
 		$this->_requestResolved=true;
 		foreach($serviceIDs as $serviceID)
@@ -880,9 +902,9 @@ 
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -890,8 +912,9 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($this->_items) as $key)
-			$this->remove($key);
+		foreach(array_keys($this->_items) as $key) {
+					$this->remove($key);
+		}
 	}
 
 	/**
@@ -999,11 +1022,12 @@ 
 		if($item instanceof THttpCookie)
 		{
 			parent::insertAt($index,$item);
-			if($this->_o instanceof THttpResponse)
-				$this->_o->addCookie($item);
+			if($this->_o instanceof THttpResponse) {
+							$this->_o->addCookie($item);
+			}
+		} else {
+					throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 		}
-		else
-			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
 
 	/**
@@ -1016,8 +1040,9 @@ 
 	public function removeAt($index)
 	{
 		$item=parent::removeAt($index);
-		if($this->_o instanceof THttpResponse)
-			$this->_o->removeCookie($item);
+		if($this->_o instanceof THttpResponse) {
+					$this->_o->removeCookie($item);
+		}
 		return $item;
 	}
 
@@ -1027,10 +1052,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if(is_integer($index))
-			return parent::itemAt($index);
-		else
-			return $this->findCookieByName($index);
+		if(is_integer($index)) {
+					return parent::itemAt($index);
+		} else {
+					return $this->findCookieByName($index);
+		}
 	}
 
 	/**
@@ -1040,9 +1066,10 @@ 
 	 */
 	public function findCookieByName($name)
 	{
-		foreach($this as $cookie)
-			if($cookie->getName()===$name)
+		foreach($this as $cookie) {
+					if($cookie->getName()===$name)
 				return $cookie;
+		}
 		return null;
 	}
 }
@@ -1303,8 +1330,7 @@ 
 			$this->_query=isset($ret['query'])?$ret['query']:'';
 			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
 			$this->_uri=$uri;
-		}
-		else
+		} else
 		{
 			throw new TInvalidDataValueException('uri_format_invalid',$uri);
 		}

framework/Web/THttpResponse.php

Doc Comments +8 added lines, -1 removed lines

@@ -181,6 +181,7 @@ 
 
 	/**
 	 * @param integer time-to-live for cached session pages in minutes, this has no effect for nocache limiter.
+	 * @param integer $value
 	 */
 	public function setCacheExpire($value)
 	{
@@ -198,6 +199,7 @@ 
 	/**
 	 * @param string cache control method to use for session pages. Valid values
 	 *               include none/nocache/private/private_no_expire/public
+	 * @param string $value
 	 */
 	public function setCacheControl($value)
 	{
@@ -223,7 +225,7 @@ 
 	}
 
 	/**
-	 * @return string|boolean output charset.
+	 * @return string output charset.
 	 */
 	public function getCharset()
 	{
@@ -232,6 +234,7 @@ 
 
 	/**
 	 * @param string|boolean output charset.
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -248,6 +251,7 @@ 
 
 	/**
 	 * @param boolean whether to enable output buffer
+	 * @param boolean $value
 	 * @throws TInvalidOperationException if session is started already
 	 */
 	public function setBufferOutput($value)
@@ -604,6 +608,7 @@ 
 	 * Sends a header.
 	 * @param string header
 	 * @param boolean whether the header should replace a previous similar header, or add a second header of the same type
+	 * @param string $value
 	 */
 	public function appendHeader($value, $replace=true)
 	{
@@ -629,6 +634,7 @@ 
 	 * Sends a cookie.
 	 * Do not call this method directly. Operate with the result of {@link getCookies} instead.
 	 * @param THttpCookie cook to be sent
+	 * @param THttpCookie $cookie
 	 */
 	public function addCookie($cookie)
 	{
@@ -713,6 +719,7 @@ 
 	 * This method is used internally. Please use {@link createHtmlWriter} instead.
 	 * @param string type of HTML writer to be created.
 	 * @param ITextWriter text writer holding the contents.
+	 * @param THttpResponse $writer
 	 */
 	public function createNewHtmlWriter($type, $writer)
 	{

Spacing +91 added lines, -91 removed lines

@@ -64,8 +64,8 @@ 
  */
 class THttpResponse extends TModule implements 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}
@@ -81,35 +81,35 @@ 
 	/**
 	 * @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
 	 */
-	private $_cookies=null;
+	private $_cookies = null;
 	/**
 	 * @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='System.Web.UI.THtmlWriter';
+	private $_htmlWriterType = 'System.Web.UI.THtmlWriter';
 	/**
 	 * @var string content type
 	 */
-	private $_contentType=null;
+	private $_contentType = null;
 	/**
 	 * @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.
 	 */
@@ -138,7 +138,7 @@ 
 	 */
 	public function setAdapter(THttpResponseAdapter $adapter)
 	{
-		$this->_adapter=$adapter;
+		$this->_adapter = $adapter;
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	public function getHasAdapter()
 	{
-		return $this->_adapter!==null;
+		return $this->_adapter !== null;
 	}
 
 	/**
@@ -165,9 +165,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 			ob_start();
-		$this->_initialized=true;
+		$this->_initialized = true;
 		$this->getApplication()->setResponse($this);
 	}
 
@@ -201,7 +201,7 @@ 
 	 */
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value,array('none','nocache','private','private_no_expire','public')));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, array('none', 'nocache', 'private', 'private_no_expire', 'public')));
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset = (strToLower($charset) === 'false') ? false : (string) $charset;
 	}
 
 	/**
@@ -252,10 +252,10 @@ 
 	 */
 	public function setBufferOutput($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
 		else
-			$this->_bufferOutput=TPropertyValue::ensureBoolean($value);
+			$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -274,24 +274,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)
 			throw new Exception('Unable to alter response as HTTP header already sent');
-		$status=TPropertyValue::ensureInteger($status);
-		if(isset(self::$HTTP_STATUS_CODES[$status])) {
-			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
-			if($reason===null || $reason==='') {
+		$status = TPropertyValue::ensureInteger($status);
+		if (isset(self::$HTTP_STATUS_CODES[$status])) {
+			$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;
 	}
 
 	/**
@@ -306,8 +306,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;
 	}
 
@@ -336,9 +336,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=array(
+		static $defaultMimeTypes = array(
 			'css'=>'text/css',
 			'gif'=>'image/gif',
 			'png'=>'image/png',
@@ -351,31 +351,31 @@ 
 			'xls'=>'application/vnd.ms-excel',
 		);
 
-		if($mimeType===null)
+		if ($mimeType === null)
 		{
-			$mimeType='text/plain';
-			if(function_exists('mime_content_type'))
-				$mimeType=mime_content_type($fileName);
-			else if(($ext=strrchr($fileName,'.'))!==false)
+			$mimeType = 'text/plain';
+			if (function_exists('mime_content_type'))
+				$mimeType = mime_content_type($fileName);
+			else if (($ext = strrchr($fileName, '.')) !== false)
 			{
-				$ext=substr($ext,1);
-				if(isset($defaultMimeTypes[$ext]))
-					$mimeType=$defaultMimeTypes[$ext];
+				$ext = substr($ext, 1);
+				if (isset($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))
+		if (is_array($headers))
 		{
-			foreach($headers as $h)
+			foreach ($headers as $h)
 				header($h);
 		}
 		else
@@ -387,10 +387,10 @@ 
 			$this->_contentTypeHeaderSent = true;
 		}
 
-		header('Content-Length: '.$fileSize);
+		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;
@@ -404,7 +404,7 @@ 
 	 */
 	public function redirect($url)
 	{
-		if($this->getHasAdapter())
+		if ($this->getHasAdapter())
 			$this->_adapter->httpRedirect($url);
 		else
 			$this->httpRedirect($url);
@@ -426,15 +426,15 @@ 
 	{
 		$this->ensureHeadersSent();
 
-		if($url[0]==='/')
-			$url=$this->getRequest()->getBaseUrl().$url;
+		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
-			header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
+			header('Location: ' . str_replace('&amp;', '&', $url), true, $this->_status);
 		else
-			header('Location: '.str_replace('&amp;','&',$url));
+			header('Location: ' . str_replace('&amp;', '&', $url));
 
-		if(!$this->getApplication()->getRequestCompleted())
+		if (!$this->getApplication()->getRequestCompleted())
 			$this->getApplication()->onEndRequest();
 
 		exit();
@@ -455,7 +455,7 @@ 
 	 */
 	public function flush($continueBuffering = true)
 	{
-		if($this->getHasAdapter())
+		if ($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
 		else
 			$this->flushContent($continueBuffering);
@@ -477,12 +477,12 @@ 
 	 */
 	public function flushContent($continueBuffering = true)
 	{
-		Prado::trace("Flushing output",'System.Web.THttpResponse');
+		Prado::trace("Flushing output", 'System.Web.THttpResponse');
 		$this->ensureHeadersSent();
-		if($this->_bufferOutput)
+		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)
 				{
@@ -512,14 +512,14 @@ 
 	 */
 	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';
 
 		$phpSapiName = substr(php_sapi_name(), 0, 3);
 		$cgi = $phpSapiName == 'cgi' || $phpSapiName == 'fpm';
 
-		header(($cgi ? 'Status:' : $protocol).' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
+		header(($cgi ? 'Status:' : $protocol) . ' ' . $this->_status . ' ' . $this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
 		$this->_httpHeaderSent = true;
 	}
@@ -538,18 +538,18 @@ 
 	 */
 	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;
 	}
@@ -562,8 +562,8 @@ 
 	 */
 	public function getContents()
 	{
-		Prado::trace("Retrieving output",'System.Web.THttpResponse');
-		return $this->_bufferOutput?ob_get_contents():'';
+		Prado::trace("Retrieving output", 'System.Web.THttpResponse');
+		return $this->_bufferOutput ? ob_get_contents() : '';
 	}
 
 	/**
@@ -571,30 +571,30 @@ 
 	 */
 	public function clear()
 	{
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 			ob_clean();
-		Prado::trace("Clearing output",'System.Web.THttpResponse');
+		Prado::trace("Clearing output", 'System.Web.THttpResponse');
 	}
 
 	/**
 	 * @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 = array();
 		$headers = headers_list();
-		foreach($headers as $header) {
+		foreach ($headers as $header) {
 			$tmp = explode(':', $header);
 			$key = trim(array_shift($tmp));
 			$value = trim(implode(':', $tmp));
-			if(isset($result[$key]))
+			if (isset($result[$key]))
 				$result[$key] .= ', ' . $value;
 			else
 				$result[$key] = $value;
 		}
 
-		if($case !== null)
+		if ($case !== null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -605,9 +605,9 @@ 
 	 * @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'",'System.Web.THttpResponse');
+		Prado::trace("Sending header '$value'", 'System.Web.THttpResponse');
 		header($value, $replace);
 	}
 
@@ -620,9 +620,9 @@ 
 	 * @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);
+		error_log($message, $messageType, $destination, $extraHeaders);
 	}
 
 	/**
@@ -632,10 +632,10 @@ 
 	 */
 	public function addCookie($cookie)
 	{
-		$request=$this->getRequest();
-		if($request->getEnableCookieValidation())
+		$request = $this->getRequest();
+		if ($request->getEnableCookieValidation())
 		{
-			$value=$this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
+			$value = $this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
 			setcookie(
 				$cookie->getName(),
 				$value,
@@ -690,7 +690,7 @@ 
 	 */
 	public function setHtmlWriterType($value)
 	{
-		$this->_htmlWriterType=$value;
+		$this->_htmlWriterType = $value;
 	}
 
 	/**
@@ -698,11 +698,11 @@ 
 	 * 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($this->getHasAdapter())
+		if ($type === null)
+			$type = $this->getHtmlWriterType();
+		if ($this->getHasAdapter())
 			return $this->_adapter->createNewHtmlWriter($type, $this);
 		else
 			return $this->createNewHtmlWriter($type, $this);

Braces +104 added lines, -79 removed lines

@@ -165,8 +165,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_bufferOutput)
-			ob_start();
+		if($this->_bufferOutput) {
+					ob_start();
+		}
 		$this->_initialized=true;
 		$this->getApplication()->setResponse($this);
 	}
@@ -209,8 +210,9 @@ 
 	 */
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
-			throw new Exception('Unable to alter content-type as it has been already sent');
+		if ($this->_contentTypeHeaderSent) {
+					throw new Exception('Unable to alter content-type as it has been already sent');
+		}
 		$this->_contentType = $type;
 	}
 
@@ -252,10 +254,11 @@ 
 	 */
 	public function setBufferOutput($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
-		else
-			$this->_bufferOutput=TPropertyValue::ensureBoolean($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
+		} else {
+					$this->_bufferOutput=TPropertyValue::ensureBoolean($value);
+		}
 	}
 
 	/**
@@ -276,12 +279,13 @@ 
 	 */
 	public function setStatusCode($status, $reason=null)
 	{
-		if ($this->_httpHeaderSent)
-			throw new Exception('Unable to alter response as HTTP header already sent');
+		if ($this->_httpHeaderSent) {
+					throw new Exception('Unable to alter response as HTTP header already sent');
+		}
 		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else{
 			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -306,8 +310,9 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies===null)
-			$this->_cookies=new THttpCookieCollection($this);
+		if($this->_cookies===null) {
+					$this->_cookies=new THttpCookieCollection($this);
+		}
 		return $this->_cookies;
 	}
 
@@ -319,8 +324,9 @@ 
 	public function write($str)
 	{
 		// when starting output make sure we send the headers first
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
-			$this->ensureHeadersSent();
+		if (!$this->_bufferOutput and !$this->_httpHeaderSent) {
+					$this->ensureHeadersSent();
+		}
 		echo $str;
 	}
 
@@ -354,31 +360,34 @@ 
 		if($mimeType===null)
 		{
 			$mimeType='text/plain';
-			if(function_exists('mime_content_type'))
-				$mimeType=mime_content_type($fileName);
-			else if(($ext=strrchr($fileName,'.'))!==false)
+			if(function_exists('mime_content_type')) {
+							$mimeType=mime_content_type($fileName);
+			} else if(($ext=strrchr($fileName,'.'))!==false)
 			{
 				$ext=substr($ext,1);
-				if(isset($defaultMimeTypes[$ext]))
-					$mimeType=$defaultMimeTypes[$ext];
+				if(isset($defaultMimeTypes[$ext])) {
+									$mimeType=$defaultMimeTypes[$ext];
+				}
 			}
 		}
 
-		if($clientFileName===null)
-			$clientFileName=basename($fileName);
-		else
-			$clientFileName=basename($clientFileName);
+		if($clientFileName===null) {
+					$clientFileName=basename($fileName);
+		} else {
+					$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))
 		{
-			foreach($headers as $h)
-				header($h);
-		}
-		else
+			foreach($headers as $h) {
+							header($h);
+			}
+		} else
 		{
 			header('Pragma: public');
 			header('Expires: 0');
@@ -390,10 +399,11 @@ 
 		header('Content-Length: '.$fileSize);
 		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
-		if($content===null)
-			readfile($fileName);
-		else
-			echo $content;
+		if($content===null) {
+					readfile($fileName);
+		} else {
+					echo $content;
+		}
 	}
 
 	/**
@@ -404,10 +414,11 @@ 
 	 */
 	public function redirect($url)
 	{
-		if($this->getHasAdapter())
-			$this->_adapter->httpRedirect($url);
-		else
-			$this->httpRedirect($url);
+		if($this->getHasAdapter()) {
+					$this->_adapter->httpRedirect($url);
+		} else {
+					$this->httpRedirect($url);
+		}
 	}
 
 	/**
@@ -426,16 +437,19 @@ 
 	{
 		$this->ensureHeadersSent();
 
-		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($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
 			header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
-		else
-			header('Location: '.str_replace('&amp;','&',$url));
+		} else {
+					header('Location: '.str_replace('&amp;','&',$url));
+		}
 
-		if(!$this->getApplication()->getRequestCompleted())
-			$this->getApplication()->onEndRequest();
+		if(!$this->getApplication()->getRequestCompleted()) {
+					$this->getApplication()->onEndRequest();
+		}
 
 		exit();
 	}
@@ -455,10 +469,11 @@ 
 	 */
 	public function flush($continueBuffering = true)
 	{
-		if($this->getHasAdapter())
-			$this->_adapter->flushContent($continueBuffering);
-		else
-			$this->flushContent($continueBuffering);
+		if($this->getHasAdapter()) {
+					$this->_adapter->flushContent($continueBuffering);
+		} else {
+					$this->flushContent($continueBuffering);
+		}
 	}
 
 	/**
@@ -488,14 +503,14 @@ 
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
+				} else {
+									ob_flush();
 				}
-				else
-					ob_flush();
 				flush();
 			}
+		} else {
+					flush();
 		}
-		else
-			flush();
 	}
 
 	/**
@@ -503,8 +518,9 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
-			$this->sendHttpHeader();
+		if (!$this->_httpHeaderSent) {
+					$this->sendHttpHeader();
+		}
 	}
 
 	/**
@@ -513,8 +529,9 @@ 
 	protected function sendHttpHeader()
 	{
 		$protocol=$this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
-			$protocol='HTTP/1.1';
+		if($this->getRequest()->getHttpProtocolVersion() === null) {
+					$protocol='HTTP/1.1';
+		}
 
 		$phpSapiName = substr(php_sapi_name(), 0, 3);
 		$cgi = $phpSapiName == 'cgi' || $phpSapiName == 'fpm';
@@ -529,8 +546,9 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
-			$this->sendContentTypeHeader();
+		if (!$this->_contentTypeHeaderSent) {
+					$this->sendContentTypeHeader();
+		}
 	}
 
 	/**
@@ -545,10 +563,13 @@ 
 			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;
+		if($charset==='') {
+			$charset = self::DEFAULT_CHARSET;
+		}
 		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
 
 		$this->_contentTypeHeaderSent = true;
@@ -571,8 +592,9 @@ 
 	 */
 	public function clear()
 	{
-		if($this->_bufferOutput)
-			ob_clean();
+		if($this->_bufferOutput) {
+					ob_clean();
+		}
 		Prado::trace("Clearing output",'System.Web.THttpResponse');
 	}
 
@@ -588,14 +610,16 @@ 
 			$tmp = explode(':', $header);
 			$key = trim(array_shift($tmp));
 			$value = trim(implode(':', $tmp));
-			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
-			else
-				$result[$key] = $value;
+			if(isset($result[$key])) {
+							$result[$key] .= ', ' . $value;
+			} else {
+							$result[$key] = $value;
+			}
 		}
 
-		if($case !== null)
-			return array_change_key_case($result, $case);
+		if($case !== null) {
+					return array_change_key_case($result, $case);
+		}
 
 		return $result;
 	}
@@ -645,8 +669,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),
@@ -700,12 +723,14 @@ 
 	 */
 	public function createHtmlWriter($type=null)
 	{
-		if($type===null)
-			$type=$this->getHtmlWriterType();
-		if($this->getHasAdapter())
-			return $this->_adapter->createNewHtmlWriter($type, $this);
-		else
-			return $this->createNewHtmlWriter($type, $this);
+		if($type===null) {
+					$type=$this->getHtmlWriterType();
+		}
+		if($this->getHasAdapter()) {
+					return $this->_adapter->createNewHtmlWriter($type, $this);
+		} else {
+					return $this->createNewHtmlWriter($type, $this);
+		}
 	}
 
 	/**

framework/Web/THttpResponseAdapter.php

Doc Comments +1 added lines

@@ -31,6 +31,7 @@
 	/**
 	 * Constructor. Attach a response to be adapted.
 	 * @param THttpResponse the response object the adapter is to attach to.
+	 * @param THttpResponse $response
 	 */
 	public function __construct($response)
 	{

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	public function __construct($response)
 	{
-		$this->_response=$response;
+		$this->_response = $response;
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function createNewHtmlWriter($type, $writer)
 	{
-		return $this->_response->createNewHtmlWriter($type,$writer);
+		return $this->_response->createNewHtmlWriter($type, $writer);
 	}
 }
 

framework/Web/THttpSession.php

Doc Comments +3 added lines

@@ -265,6 +265,7 @@ 
 	 * If true, make sure the methods {@link _open}, {@link _close}, {@link _read},
 	 * {@link _write}, {@link _destroy}, and {@link _gc} are overridden in child
 	 * class, because they will be used as the callback handlers.
+	 * @param boolean $value
 	 */
 	public function setUseCustomStorage($value)
 	{
@@ -527,6 +528,7 @@ 
 	 * Returns the session variable value with the session variable name.
 	 * This method is exactly the same as {@link offsetGet}.
 	 * @param mixed the session variable name
+	 * @param string $key
 	 * @return mixed the session variable value, null if no such variable exists
 	 */
 	public function itemAt($key)
@@ -539,6 +541,7 @@ 
 	 * Note, if the specified name already exists, the old value will be removed first.
 	 * @param mixed session variable name
 	 * @param mixed session variable value
+	 * @param string $key
 	 */
 	public function add($key,$value)
 	{

Indentation +2 added lines, -2 removed lines

@@ -306,10 +306,10 @@
 		{
 			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
-      {
+	  {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
+	  }
 			else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');

Spacing +76 added lines, -76 removed lines

@@ -67,24 +67,24 @@ 
  * @package System.Web
  * @since 3.0
  */
-class THttpSession extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
+class THttpSession extends TApplicationComponent implements IteratorAggregate, ArrayAccess, Countable, IModule
 {
 	/**
 	 * @var boolean whether this module has been initialized
 	 */
-	private $_initialized=false;
+	private $_initialized = false;
 	/**
 	 * @var boolean whether the session has started
 	 */
-	private $_started=false;
+	private $_started = false;
 	/**
 	 * @var boolean whether the session should be started when the module is initialized
 	 */
-	private $_autoStart=false;
+	private $_autoStart = false;
 	/**
 	 * @var THttpCookie cookie to be used to store session ID and other data
 	 */
-	private $_cookie=null;
+	private $_cookie = null;
 	/**
 	 * @var string module id
 	 */
@@ -92,7 +92,7 @@ 
 	/**
 	 * @var boolean
 	 */
-	private $_customStorage=false;
+	private $_customStorage = false;
 
 	/**
 	 * @return string id of this module
@@ -107,7 +107,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 
 	/**
@@ -118,9 +118,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_autoStart)
+		if ($this->_autoStart)
 			$this->open();
-		$this->_initialized=true;
+		$this->_initialized = true;
 		$this->getApplication()->setSession($this);
 		register_shutdown_function(array($this, "close"));
 	}
@@ -130,15 +130,15 @@ 
 	 */
 	public function open()
 	{
-		if(!$this->_started)
+		if (!$this->_started)
 		{
-			if($this->_customStorage)
-				session_set_save_handler(array($this,'_open'),array($this,'_close'),array($this,'_read'),array($this,'_write'),array($this,'_destroy'),array($this,'_gc'));
-			if($this->_cookie!==null)
-				session_set_cookie_params($this->_cookie->getExpire(),$this->_cookie->getPath(),$this->_cookie->getDomain(),$this->_cookie->getSecure(),$this->_cookie->getHttpOnly());
-			if(ini_get('session.auto_start')!=='1')
+			if ($this->_customStorage)
+				session_set_save_handler(array($this, '_open'), array($this, '_close'), array($this, '_read'), array($this, '_write'), array($this, '_destroy'), array($this, '_gc'));
+			if ($this->_cookie !== null)
+				session_set_cookie_params($this->_cookie->getExpire(), $this->_cookie->getPath(), $this->_cookie->getDomain(), $this->_cookie->getSecure(), $this->_cookie->getHttpOnly());
+			if (ini_get('session.auto_start') !== '1')
 				session_start();
-			$this->_started=true;
+			$this->_started = true;
 		}
 	}
 
@@ -147,10 +147,10 @@ 
 	 */
 	public function close()
 	{
-		if($this->_started)
+		if ($this->_started)
 		{
 			session_write_close();
-			$this->_started=false;
+			$this->_started = false;
 		}
 	}
 
@@ -159,10 +159,10 @@ 
 	 */
 	public function destroy()
 	{
-		if($this->_started)
+		if ($this->_started)
 		{
 			session_destroy();
-			$this->_started=false;
+			$this->_started = false;
 		}
 	}
 
@@ -173,7 +173,7 @@ 
 	 * @return string old session id
 	 * @link http://php.net/manual/en/function.session-regenerate-id.php
 	 */
-	public function regenerate($deleteOld=false)
+	public function regenerate($deleteOld = false)
 	{
 		$old = $this->getSessionID();
 		session_regenerate_id($deleteOld);
@@ -202,7 +202,7 @@ 
 	 */
 	public function setSessionID($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
 		else
 			session_id($value);
@@ -222,12 +222,12 @@ 
 	 */
 	public function setSessionName($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
-		else if(ctype_alnum($value))
+		else if (ctype_alnum($value))
 			session_name($value);
 		else
-			throw new TInvalidDataValueException('httpsession_sessionname_invalid',$value);
+			throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
 	}
 
 	/**
@@ -244,12 +244,12 @@ 
 	 */
 	public function setSavePath($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_savepath_unchangeable');
-		else if(is_dir($value))
+		else if (is_dir($value))
 			session_save_path($value);
 		else
-			throw new TInvalidDataValueException('httpsession_savepath_invalid',$value);
+			throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 */
 	public function setUseCustomStorage($value)
 	{
-		$this->_customStorage=TPropertyValue::ensureBoolean($value);
+		$this->_customStorage = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -276,8 +276,8 @@ 
 	 */
 	public function getCookie()
 	{
-		if($this->_cookie===null)
-			$this->_cookie=new THttpCookie($this->getSessionName(),$this->getSessionID());
+		if ($this->_cookie === null)
+			$this->_cookie = new THttpCookie($this->getSessionName(), $this->getSessionID());
 		return $this->_cookie;
 	}
 
@@ -286,9 +286,9 @@ 
 	 */
 	public function getCookieMode()
 	{
-		if(ini_get('session.use_cookies')==='0')
+		if (ini_get('session.use_cookies') === '0')
 			return THttpSessionCookieMode::None;
-		else if(ini_get('session.use_only_cookies')==='0')
+		else if (ini_get('session.use_only_cookies') === '0')
 			return THttpSessionCookieMode::Allow;
 		else
 			return THttpSessionCookieMode::Only;
@@ -300,25 +300,25 @@ 
 	 */
 	public function setCookieMode($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
 		else
 		{
-			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
-			if($value===THttpSessionCookieMode::None) 
+			$value = TPropertyValue::ensureEnum($value, 'THttpSessionCookieMode');
+			if ($value === THttpSessionCookieMode::None) 
       {
-				ini_set('session.use_cookies','0');
-			  ini_set('session.use_only_cookies','0');
+				ini_set('session.use_cookies', '0');
+			  ini_set('session.use_only_cookies', '0');
       }
-			else if($value===THttpSessionCookieMode::Allow)
+			else if ($value === THttpSessionCookieMode::Allow)
 			{
-				ini_set('session.use_cookies','1');
-				ini_set('session.use_only_cookies','0');
+				ini_set('session.use_cookies', '1');
+				ini_set('session.use_only_cookies', '0');
 			}
 			else
 			{
-				ini_set('session.use_cookies','1');
-				ini_set('session.use_only_cookies','1');
+				ini_set('session.use_cookies', '1');
+				ini_set('session.use_only_cookies', '1');
 				ini_set('session.use_trans_sid', 0);
 			}
 		}
@@ -338,10 +338,10 @@ 
 	 */
 	public function setAutoStart($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('httpsession_autostart_unchangeable');
 		else
-			$this->_autoStart=TPropertyValue::ensureBoolean($value);
+			$this->_autoStart = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -359,18 +359,18 @@ 
 	 */
 	public function setGCProbability($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
 		else
 		{
-			$value=TPropertyValue::ensureInteger($value);
-			if($value>=0 && $value<=100)
+			$value = TPropertyValue::ensureInteger($value);
+			if ($value >= 0 && $value <= 100)
 			{
-				ini_set('session.gc_probability',$value);
-				ini_set('session.gc_divisor','100');
+				ini_set('session.gc_probability', $value);
+				ini_set('session.gc_divisor', '100');
 			}
 			else
-				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
+				throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 		}
 	}
 
@@ -379,7 +379,7 @@ 
 	 */
 	public function getUseTransparentSessionID()
 	{
-		return ini_get('session.use_trans_sid')==='1';
+		return ini_get('session.use_trans_sid') === '1';
 	}
 
 	/**
@@ -387,14 +387,14 @@ 
 	 */
 	public function setUseTransparentSessionID($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_transid_unchangeable');
 		else
 		{
-			$value=TPropertyValue::ensureBoolean($value);
-			if ($value && $this->getCookieMode()==THttpSessionCookieMode::Only)
+			$value = TPropertyValue::ensureBoolean($value);
+			if ($value && $this->getCookieMode() == THttpSessionCookieMode::Only)
 					throw new TInvalidOperationException('httpsession_transid_cookieonly');
-			ini_set('session.use_trans_sid',$value?'1':'0');
+			ini_set('session.use_trans_sid', $value ? '1' : '0');
 		}
 	}
 
@@ -412,10 +412,10 @@ 
 	 */
 	public function setTimeout($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
 		else
-			ini_set('session.gc_maxlifetime',$value);
+			ini_set('session.gc_maxlifetime', $value);
 	}
 
 	/**
@@ -425,7 +425,7 @@ 
 	 * @param string session name
 	 * @return boolean whether session is opened successfully
 	 */
-	public function _open($savePath,$sessionName)
+	public function _open($savePath, $sessionName)
 	{
 		return true;
 	}
@@ -458,7 +458,7 @@ 
 	 * @param string session data
 	 * @return boolean whether session write is successful
 	 */
-	public function _write($id,$data)
+	public function _write($id, $data)
 	{
 		return true;
 	}
@@ -540,9 +540,9 @@ 
 	 * @param mixed session variable name
 	 * @param mixed session variable value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		$_SESSION[$key]=$value;
+		$_SESSION[$key] = $value;
 	}
 
 	/**
@@ -552,9 +552,9 @@ 
 	 */
 	public function remove($key)
 	{
-		if(isset($_SESSION[$key]))
+		if (isset($_SESSION[$key]))
 		{
-			$value=$_SESSION[$key];
+			$value = $_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
 		}
@@ -567,7 +567,7 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($_SESSION) as $key)
+		foreach (array_keys($_SESSION) as $key)
 			unset($_SESSION[$key]);
 	}
 
@@ -613,9 +613,9 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$_SESSION[$offset]=$item;
+		$_SESSION[$offset] = $item;
 	}
 
 	/**
@@ -657,7 +657,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_keys=array_keys($_SESSION);
+		$this->_keys = array_keys($_SESSION);
 	}
 
 	/**
@@ -666,7 +666,7 @@ 
 	 */
 	public function rewind()
 	{
-		$this->_key=reset($this->_keys);
+		$this->_key = reset($this->_keys);
 	}
 
 	/**
@@ -686,7 +686,7 @@ 
 	 */
 	public function current()
 	{
-		return isset($_SESSION[$this->_key])?$_SESSION[$this->_key]:null;
+		return isset($_SESSION[$this->_key]) ? $_SESSION[$this->_key] : null;
 	}
 
 	/**
@@ -697,9 +697,9 @@ 
 	{
 		do
 		{
-			$this->_key=next($this->_keys);
+			$this->_key = next($this->_keys);
 		}
-		while(!isset($_SESSION[$this->_key]) && $this->_key!==false);
+		while (!isset($_SESSION[$this->_key]) && $this->_key !== false);
 	}
 
 	/**
@@ -709,7 +709,7 @@ 
 	 */
 	public function valid()
 	{
-		return $this->_key!==false;
+		return $this->_key !== false;
 	}
 }
 
@@ -730,8 +730,8 @@ 
  */
 class THttpSessionCookieMode extends TEnumerable
 {
-	const None='None';
-	const Allow='Allow';
-	const Only='Only';
+	const None = 'None';
+	const Allow = 'Allow';
+	const Only = 'Only';
 }
 

Braces +72 added lines, -61 removed lines

@@ -118,8 +118,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_autoStart)
-			$this->open();
+		if($this->_autoStart) {
+					$this->open();
+		}
 		$this->_initialized=true;
 		$this->getApplication()->setSession($this);
 		register_shutdown_function(array($this, "close"));
@@ -132,12 +133,15 @@ 
 	{
 		if(!$this->_started)
 		{
-			if($this->_customStorage)
-				session_set_save_handler(array($this,'_open'),array($this,'_close'),array($this,'_read'),array($this,'_write'),array($this,'_destroy'),array($this,'_gc'));
-			if($this->_cookie!==null)
-				session_set_cookie_params($this->_cookie->getExpire(),$this->_cookie->getPath(),$this->_cookie->getDomain(),$this->_cookie->getSecure(),$this->_cookie->getHttpOnly());
-			if(ini_get('session.auto_start')!=='1')
-				session_start();
+			if($this->_customStorage) {
+							session_set_save_handler(array($this,'_open'),array($this,'_close'),array($this,'_read'),array($this,'_write'),array($this,'_destroy'),array($this,'_gc'));
+			}
+			if($this->_cookie!==null) {
+							session_set_cookie_params($this->_cookie->getExpire(),$this->_cookie->getPath(),$this->_cookie->getDomain(),$this->_cookie->getSecure(),$this->_cookie->getHttpOnly());
+			}
+			if(ini_get('session.auto_start')!=='1') {
+							session_start();
+			}
 			$this->_started=true;
 		}
 	}
@@ -202,10 +206,11 @@ 
 	 */
 	public function setSessionID($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
-		else
-			session_id($value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
+		} else {
+					session_id($value);
+		}
 	}
 
 	/**
@@ -222,12 +227,13 @@ 
 	 */
 	public function setSessionName($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
-		else if(ctype_alnum($value))
-			session_name($value);
-		else
-			throw new TInvalidDataValueException('httpsession_sessionname_invalid',$value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
+		} else if(ctype_alnum($value)) {
+					session_name($value);
+		} else {
+					throw new TInvalidDataValueException('httpsession_sessionname_invalid',$value);
+		}
 	}
 
 	/**
@@ -244,12 +250,13 @@ 
 	 */
 	public function setSavePath($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_savepath_unchangeable');
-		else if(is_dir($value))
-			session_save_path($value);
-		else
-			throw new TInvalidDataValueException('httpsession_savepath_invalid',$value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_savepath_unchangeable');
+		} else if(is_dir($value)) {
+					session_save_path($value);
+		} else {
+					throw new TInvalidDataValueException('httpsession_savepath_invalid',$value);
+		}
 	}
 
 	/**
@@ -276,8 +283,9 @@ 
 	 */
 	public function getCookie()
 	{
-		if($this->_cookie===null)
-			$this->_cookie=new THttpCookie($this->getSessionName(),$this->getSessionID());
+		if($this->_cookie===null) {
+					$this->_cookie=new THttpCookie($this->getSessionName(),$this->getSessionID());
+		}
 		return $this->_cookie;
 	}
 
@@ -286,12 +294,13 @@ 
 	 */
 	public function getCookieMode()
 	{
-		if(ini_get('session.use_cookies')==='0')
-			return THttpSessionCookieMode::None;
-		else if(ini_get('session.use_only_cookies')==='0')
-			return THttpSessionCookieMode::Allow;
-		else
-			return THttpSessionCookieMode::Only;
+		if(ini_get('session.use_cookies')==='0') {
+					return THttpSessionCookieMode::None;
+		} else if(ini_get('session.use_only_cookies')==='0') {
+					return THttpSessionCookieMode::Allow;
+		} else {
+					return THttpSessionCookieMode::Only;
+		}
 	}
 
 	/**
@@ -300,22 +309,20 @@ 
 	 */
 	public function setCookieMode($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
+		} else
 		{
 			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
       {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
-			else if($value===THttpSessionCookieMode::Allow)
+      } else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','0');
-			}
-			else
+			} else
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','1');
@@ -338,10 +345,11 @@ 
 	 */
 	public function setAutoStart($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('httpsession_autostart_unchangeable');
-		else
-			$this->_autoStart=TPropertyValue::ensureBoolean($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('httpsession_autostart_unchangeable');
+		} else {
+					$this->_autoStart=TPropertyValue::ensureBoolean($value);
+		}
 	}
 
 	/**
@@ -359,18 +367,18 @@ 
 	 */
 	public function setGCProbability($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
+		} else
 		{
 			$value=TPropertyValue::ensureInteger($value);
 			if($value>=0 && $value<=100)
 			{
 				ini_set('session.gc_probability',$value);
 				ini_set('session.gc_divisor','100');
+			} else {
+							throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
 			}
-			else
-				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
 		}
 	}
 
@@ -387,13 +395,14 @@ 
 	 */
 	public function setUseTransparentSessionID($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_transid_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_transid_unchangeable');
+		} else
 		{
 			$value=TPropertyValue::ensureBoolean($value);
-			if ($value && $this->getCookieMode()==THttpSessionCookieMode::Only)
-					throw new TInvalidOperationException('httpsession_transid_cookieonly');
+			if ($value && $this->getCookieMode()==THttpSessionCookieMode::Only) {
+								throw new TInvalidOperationException('httpsession_transid_cookieonly');
+			}
 			ini_set('session.use_trans_sid',$value?'1':'0');
 		}
 	}
@@ -412,10 +421,11 @@ 
 	 */
 	public function setTimeout($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
-		else
-			ini_set('session.gc_maxlifetime',$value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
+		} else {
+					ini_set('session.gc_maxlifetime',$value);
+		}
 	}
 
 	/**
@@ -557,9 +567,9 @@ 
 			$value=$_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -567,8 +577,9 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($_SESSION) as $key)
-			unset($_SESSION[$key]);
+		foreach(array_keys($_SESSION) as $key) {
+					unset($_SESSION[$key]);
+		}
 	}
 
 	/**

framework/Web/THttpUtility.php

Doc Comments +1 added lines

@@ -39,6 +39,7 @@
 	 * HTML-decodes a string.
 	 * It is the inverse of {@link htmlEncode}.
 	 * @param string string to be decoded
+	 * @param string $s
 	 * @return string decoded string
 	 */
 	public static function htmlDecode($s)

Spacing +6 added lines, -6 removed lines

@@ -18,9 +18,9 @@ 
  */
 class THttpUtility
 {
-	private static $_encodeTable=array('<'=>'&lt;','>'=>'&gt;','"'=>'&quot;');
-	private static $_decodeTable=array('&lt;'=>'<','&gt;'=>'>','&quot;'=>'"');
-	private static $_stripTable=array('&lt;'=>'','&gt;'=>'','&quot;'=>'');
+	private static $_encodeTable = array('<'=>'&lt;', '>'=>'&gt;', '"'=>'&quot;');
+	private static $_decodeTable = array('&lt;'=>'<', '&gt;'=>'>', '&quot;'=>'"');
+	private static $_stripTable = array('&lt;'=>'', '&gt;'=>'', '&quot;'=>'');
 
 	/**
 	 * HTML-encodes a string.
@@ -32,7 +32,7 @@ 
 	 */
 	public static function htmlEncode($s)
 	{
-		return strtr($s,self::$_encodeTable);
+		return strtr($s, self::$_encodeTable);
 	}
 
 	/**
@@ -43,7 +43,7 @@ 
 	 */
 	public static function htmlDecode($s)
 	{
-		return strtr($s,self::$_decodeTable);
+		return strtr($s, self::$_decodeTable);
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	 */
 	public static function htmlStrip($s)
 	{
-		return strtr($s,self::$_stripTable);
+		return strtr($s, self::$_stripTable);
 	}
 }
 

framework/Web/TUrlMapping.php

Doc Comments +4 added lines, -1 removed lines

@@ -96,6 +96,7 @@ 
 	 * Initializes this module.
 	 * This method is required by the IModule interface.
 	 * @param mixed configuration for this module, can be null
+	 * @param TXmlDocument $config
 	 * @throws TConfigurationException if module is configured in the global scope.
 	 */
 	public function init($config)
@@ -606,6 +607,7 @@ 
 
 	/**
 	 * @param string full regular expression mapping pattern.
+	 * @param string $value
 	 */
 	public function setRegularExpression($value)
 	{
@@ -715,6 +717,7 @@ 
 	 * Uses URL pattern (or full regular expression if available) to
 	 * match the given url path.
 	 * @param THttpRequest the request module
+	 * @param THttpRequest $request
 	 * @return array matched parameters, empty if no matches.
 	 */
 	public function getPatternMatches($request)
@@ -785,7 +788,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequestUrlFormat the format of URLs. Defaults to THttpRequestUrlFormat::Get.
+	 * @return string the format of URLs. Defaults to THttpRequestUrlFormat::Get.
 	 */
 	public function getUrlFormat()
 	{

Spacing +159 added lines, -159 removed lines

@@ -70,7 +70,7 @@ 
 	/**
 	 * @var TUrlMappingPattern[] list of patterns.
 	 */
-	protected $_patterns=array();
+	protected $_patterns = array();
 	/**
 	 * @var TUrlMappingPattern matched pattern.
 	 */
@@ -78,19 +78,19 @@ 
 	/**
 	 * @var string external configuration file
 	 */
-	private $_configFile=null;
+	private $_configFile = null;
 	/**
 	 * @var boolean whether to enable custom contructUrl
 	 */
-	private $_customUrl=false;
+	private $_customUrl = false;
 	/**
 	 * @var array rules for constructing URLs
 	 */
-	protected $_constructRules=array();
+	protected $_constructRules = array();
 
-	private $_urlPrefix='';
+	private $_urlPrefix = '';
 
-	private $_defaultMappingClass='TUrlMappingPattern';
+	private $_defaultMappingClass = 'TUrlMappingPattern';
 
 	/**
 	 * Initializes this module.
@@ -101,22 +101,22 @@ 
 	public function init($config)
 	{
 		parent::init($config);
-		if($this->getRequest()->getRequestResolved())
+		if ($this->getRequest()->getRequestResolved())
 			throw new TConfigurationException('urlmapping_global_required');
-		if($this->_configFile!==null)
+		if ($this->_configFile !== null)
 			$this->loadConfigFile();
 		$this->loadUrlMappings($config);
-		if($this->_urlPrefix==='')
+		if ($this->_urlPrefix === '')
 		{
-			$request=$this->getRequest();
-			if($request->getUrlFormat()===THttpRequestUrlFormat::HiddenPath)
+			$request = $this->getRequest();
+			if ($request->getUrlFormat() === THttpRequestUrlFormat::HiddenPath)
 			{
-				$this->_urlPrefix=dirname($request->getApplicationUrl());
+				$this->_urlPrefix = dirname($request->getApplicationUrl());
 			} else {
-				$this->_urlPrefix=$request->getApplicationUrl();
+				$this->_urlPrefix = $request->getApplicationUrl();
 			}
 		}
-		$this->_urlPrefix=rtrim($this->_urlPrefix,'/');
+		$this->_urlPrefix = rtrim($this->_urlPrefix, '/');
 	}
 
 	/**
@@ -125,22 +125,22 @@ 
 	 */
 	protected function loadConfigFile()
 	{
-		if(is_file($this->_configFile))
+		if (is_file($this->_configFile))
 		{
-			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 			{
 				$config = include $this->_configFile;
 				$this->loadUrlMappings($dom);
 			}
 			else
 			{
-				$dom=new TXmlDocument;
+				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadUrlMappings($dom);
 			}
 		}
 		else
-			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
+			throw new TConfigurationException('urlmapping_configfile_inexistent', $this->_configFile);
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	 */
 	public function setEnableCustomUrl($value)
 	{
-		$this->_customUrl=TPropertyValue::ensureBoolean($value);
+		$this->_customUrl = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -183,7 +183,7 @@ 
 	 */
 	public function setUrlPrefix($value)
 	{
-		$this->_urlPrefix=$value;
+		$this->_urlPrefix = $value;
 	}
 
 	/**
@@ -201,8 +201,8 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,$this->getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('urlmapping_configfile_invalid',$value);
+		if (($this->_configFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null)
+			throw new TConfigurationException('urlmapping_configfile_invalid', $value);
 	}
 
 	/**
@@ -223,7 +223,7 @@ 
 	 */
 	public function setDefaultMappingClass($value)
 	{
-		$this->_defaultMappingClass=$value;
+		$this->_defaultMappingClass = $value;
 	}
 
 	/**
@@ -235,43 +235,43 @@ 
 	{
 		$defaultClass = $this->getDefaultMappingClass();
 
-		if(is_array($config))
+		if (is_array($config))
 		{
-			if(isset($config['urls']) && is_array($config['urls']))
+			if (isset($config['urls']) && is_array($config['urls']))
 			{
-				foreach($config['urls'] as $url)
+				foreach ($config['urls'] as $url)
 				{
-					$class=isset($url['class'])?$url['class']:$defaultClass;
-					$properties = isset($url['properties'])?$url['properties']:array();
-					$this->buildUrlMapping($class,$properties,$url);
+					$class = isset($url['class']) ? $url['class'] : $defaultClass;
+					$properties = isset($url['properties']) ? $url['properties'] : array();
+					$this->buildUrlMapping($class, $properties, $url);
 				}
 			}
 		}
 		else
 		{
-			foreach($config->getElementsByTagName('url') as $url)
+			foreach ($config->getElementsByTagName('url') as $url)
 			{
-				$properties=$url->getAttributes();
-				if(($class=$properties->remove('class'))===null)
-					$class=$defaultClass;
-				$this->buildUrlMapping($class,$properties,$url);
+				$properties = $url->getAttributes();
+				if (($class = $properties->remove('class')) === null)
+					$class = $defaultClass;
+				$this->buildUrlMapping($class, $properties, $url);
 			}
 		}
 	}
 
 	private function buildUrlMapping($class, $properties, $url)
 	{
-		$pattern=Prado::createComponent($class,$this);
-		if(!($pattern instanceof TUrlMappingPattern))
+		$pattern = Prado::createComponent($class, $this);
+		if (!($pattern instanceof TUrlMappingPattern))
 			throw new TConfigurationException('urlmapping_urlmappingpattern_required');
-		foreach($properties as $name=>$value)
-			$pattern->setSubproperty($name,$value);
+		foreach ($properties as $name=>$value)
+			$pattern->setSubproperty($name, $value);
 
-		if($url instanceof TXmlElement) {
+		if ($url instanceof TXmlElement) {
 			$text = $url -> getValue();
-			if($text) {
+			if ($text) {
 				$text = preg_replace('/(\s+)/S', '', $text);
-				if(($regExp = $pattern->getRegularExpression()) !== '')
+				if (($regExp = $pattern->getRegularExpression()) !== '')
 				trigger_error(sPrintF('%s.RegularExpression property value "%s" for ServiceID="%s" and ServiceParameter="%s" was replaced by node value "%s"',
 				get_class($pattern),
 				$regExp,
@@ -283,11 +283,11 @@ 
 			}
 		}
 
-		$this->_patterns[]=$pattern;
+		$this->_patterns[] = $pattern;
 		$pattern->init($url);
 
-		$key=$pattern->getServiceID().':'.$pattern->getServiceParameter();
-		$this->_constructRules[$key][]=$pattern;
+		$key = $pattern->getServiceID() . ':' . $pattern->getServiceParameter();
+		$this->_constructRules[$key][] = $pattern;
 	}
 
 	/**
@@ -300,21 +300,21 @@ 
 	 */
 	public function parseUrl()
 	{
-		$request=$this->getRequest();
-		foreach($this->_patterns as $pattern)
+		$request = $this->getRequest();
+		foreach ($this->_patterns as $pattern)
 		{
-			$matches=$pattern->getPatternMatches($request);
-			if(count($matches)>0)
+			$matches = $pattern->getPatternMatches($request);
+			if (count($matches) > 0)
 			{
-				$this->_matched=$pattern;
-				$params=array();
-				foreach($matches as $key=>$value)
+				$this->_matched = $pattern;
+				$params = array();
+				foreach ($matches as $key=>$value)
 				{
-					if(is_string($key))
-						$params[$key]=$value;
+					if (is_string($key))
+						$params[$key] = $value;
 				}
 				if (!$pattern->getIsWildCardPattern())
-					$params[$pattern->getServiceID()]=$pattern->getServiceParameter();
+					$params[$pattern->getServiceID()] = $pattern->getServiceParameter();
 				return $params;
 			}
 		}
@@ -345,36 +345,36 @@ 
 	 * @see parseUrl
 	 * @since 3.1.1
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
-		if($this->_customUrl)
+		if ($this->_customUrl)
 		{
-			if(!(is_array($getItems) || ($getItems instanceof Traversable)))
-				$getItems=array();
-			$key=$serviceID.':'.$serviceParam;
-			$wildCardKey = ($pos=strrpos($serviceParam,'.'))!==false ?
-				$serviceID.':'.substr($serviceParam,0,$pos).'.*' : $serviceID.':*';
-			if(isset($this->_constructRules[$key]))
+			if (!(is_array($getItems) || ($getItems instanceof Traversable)))
+				$getItems = array();
+			$key = $serviceID . ':' . $serviceParam;
+			$wildCardKey = ($pos = strrpos($serviceParam, '.')) !== false ?
+				$serviceID . ':' . substr($serviceParam, 0, $pos) . '.*' : $serviceID . ':*';
+			if (isset($this->_constructRules[$key]))
 			{
-				foreach($this->_constructRules[$key] as $rule)
+				foreach ($this->_constructRules[$key] as $rule)
 				{
-					if($rule->supportCustomUrl($getItems))
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+					if ($rule->supportCustomUrl($getItems))
+						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 				}
 			}
-			elseif(isset($this->_constructRules[$wildCardKey]))
+			elseif (isset($this->_constructRules[$wildCardKey]))
 			{
-				foreach($this->_constructRules[$wildCardKey] as $rule)
+				foreach ($this->_constructRules[$wildCardKey] as $rule)
 				{
-					if($rule->supportCustomUrl($getItems))
+					if ($rule->supportCustomUrl($getItems))
 					{
-						$getItems['*']= $pos ? substr($serviceParam,$pos+1) : $serviceParam;
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+						$getItems['*'] = $pos ? substr($serviceParam, $pos + 1) : $serviceParam;
+						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 					}
 				}
 			}
 		}
-		return parent::constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
+		return parent::constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
 	}
 
 	/**
@@ -494,7 +494,7 @@ 
 	/**
 	 * @var string service ID, default is 'page'.
 	 */
-	private $_serviceID='page';
+	private $_serviceID = 'page';
 	/**
 	 * @var string url pattern to match.
 	 */
@@ -510,19 +510,19 @@ 
 	/**
 	 * @var string regular expression pattern.
 	 */
-	private $_regexp='';
+	private $_regexp = '';
 
-	private $_customUrl=true;
+	private $_customUrl = true;
 
 	private $_manager;
 
-	private $_caseSensitive=true;
+	private $_caseSensitive = true;
 
-	private $_isWildCardPattern=false;
+	private $_isWildCardPattern = false;
 
-	private $_urlFormat=THttpRequestUrlFormat::Get;
+	private $_urlFormat = THttpRequestUrlFormat::Get;
 
-	private $_separator='/';
+	private $_separator = '/';
 
 	/**
 	 * @var TUrlMappingPatternSecureConnection
@@ -536,7 +536,7 @@ 
 	 */
 	public function __construct(TUrlManager $manager)
 	{
-		$this->_manager=$manager;
+		$this->_manager = $manager;
 	}
 
 	/**
@@ -554,10 +554,10 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_serviceParameter===null)
+		if ($this->_serviceParameter === null)
 			throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
-		if(strpos($this->_serviceParameter,'*')!==false)
-				$this->_isWildCardPattern=true;
+		if (strpos($this->_serviceParameter, '*') !== false)
+				$this->_isWildCardPattern = true;
 	}
 
 	/**
@@ -567,32 +567,32 @@ 
 	 */
 	protected function getParameterizedPattern()
 	{
-		$params=array();
-		$values=array();
+		$params = array();
+		$values = array();
 		if ($this->_parameters)
 		{
-			foreach($this->_parameters as $key=>$value)
+			foreach ($this->_parameters as $key=>$value)
 			{
-				$params[]='{'.$key.'}';
-				$values[]='(?P<'.$key.'>'.$value.')';
+				$params[] = '{' . $key . '}';
+				$values[] = '(?P<' . $key . '>' . $value . ')';
 			}
 		}
 		if ($this->getIsWildCardPattern())
 		{
-				$params[]='{*}';
+				$params[] = '{*}';
 				// service parameter must not contain '=' and '/'
-				$values[]='(?P<'.$this->getServiceID().'>[^=/]+)';
+				$values[] = '(?P<' . $this->getServiceID() . '>[^=/]+)';
 		}
-		$params[]='/';
-		$values[]='\\/';
-		$regexp=str_replace($params,$values,trim($this->getPattern(),'/').'/');
-		if ($this->_urlFormat===THttpRequestUrlFormat::Get)
-				$regexp='/^'.$regexp.'$/u';
+		$params[] = '/';
+		$values[] = '\\/';
+		$regexp = str_replace($params, $values, trim($this->getPattern(), '/') . '/');
+		if ($this->_urlFormat === THttpRequestUrlFormat::Get)
+				$regexp = '/^' . $regexp . '$/u';
 		else
-				$regexp='/^'.$regexp.'(?P<urlparams>.*)$/u';
+				$regexp = '/^' . $regexp . '(?P<urlparams>.*)$/u';
 
-		if(!$this->getCaseSensitive())
-			$regexp.='i';
+		if (!$this->getCaseSensitive())
+			$regexp .= 'i';
 		return $regexp;
 	}
 
@@ -609,7 +609,7 @@ 
 	 */
 	public function setRegularExpression($value)
 	{
-		$this->_regexp=$value;
+		$this->_regexp = $value;
 	}
 
 	/**
@@ -625,7 +625,7 @@ 
 	 */
 	public function setCaseSensitive($value)
 	{
-		$this->_caseSensitive=TPropertyValue::ensureBoolean($value);
+		$this->_caseSensitive = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -633,7 +633,7 @@ 
 	 */
 	public function setServiceParameter($value)
 	{
-		$this->_serviceParameter=$value;
+		$this->_serviceParameter = $value;
 	}
 
 	/**
@@ -649,7 +649,7 @@ 
 	 */
 	public function setServiceID($value)
 	{
-		$this->_serviceID=$value;
+		$this->_serviceID = $value;
 	}
 
 	/**
@@ -683,7 +683,7 @@ 
 	{
 		if (!$this->_parameters)
 		{
-			$this->_parameters=new TAttributeCollection;
+			$this->_parameters = new TAttributeCollection;
 			$this->_parameters->setCaseSensitive(true);
 		}
 		return $this->_parameters;
@@ -694,7 +694,7 @@ 
 	 */
 	public function setParameters($value)
 	{
-		$this->_parameters=$value;
+		$this->_parameters = $value;
 	}
 
 	/**
@@ -719,38 +719,38 @@ 
 	 */
 	public function getPatternMatches($request)
 	{
-		$matches=array();
-		if(($pattern=$this->getRegularExpression())!=='')
-			preg_match($pattern,$request->getPathInfo(),$matches);
+		$matches = array();
+		if (($pattern = $this->getRegularExpression()) !== '')
+			preg_match($pattern, $request->getPathInfo(), $matches);
 		else
-			preg_match($this->getParameterizedPattern(),trim($request->getPathInfo(),'/').'/',$matches);
+			preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/') . '/', $matches);
 
-		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
-			$matches[$this->_serviceID]=str_replace('*',$matches[$this->_serviceID],$this->_serviceParameter);
+		if ($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
+			$matches[$this->_serviceID] = str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
 
 		if (isset($matches['urlparams']))
 		{
-			$params=explode('/',$matches['urlparams']);
-			if ($this->_separator==='/')
+			$params = explode('/', $matches['urlparams']);
+			if ($this->_separator === '/')
 			{
-				while($key=array_shift($params))
-					$matches[$key]=($value=array_shift($params)) ? $value : '';
+				while ($key = array_shift($params))
+					$matches[$key] = ($value = array_shift($params)) ? $value : '';
 			}
 			else
 			{
 				array_pop($params);
-				foreach($params as $param)
+				foreach ($params as $param)
 				{
-					list($key,$value)=explode($this->_separator,$param,2);
-					$matches[$key]=$value;
+					list($key, $value) = explode($this->_separator, $param, 2);
+					$matches[$key] = $value;
 				}
 			}
 			unset($matches['urlparams']);
 		}
 
-		if(count($matches) > 0 && $this->_constants)
+		if (count($matches) > 0 && $this->_constants)
 		{
-			foreach($this->_constants->toArray() as $key=>$value)
+			foreach ($this->_constants->toArray() as $key=>$value)
 				$matches[$key] = $value;
 		}
 
@@ -773,7 +773,7 @@ 
 	 */
 	public function setEnableCustomUrl($value)
 	{
-		$this->_customUrl=TPropertyValue::ensureBoolean($value);
+		$this->_customUrl = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -805,7 +805,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat = TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 
 	/**
@@ -822,8 +822,8 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value)===1)
-			$this->_separator=$value;
+		if (strlen($value) === 1)
+			$this->_separator = $value;
 		else
 			throw new TInvalidDataValueException('httprequest_separator_invalid');
 	}
@@ -853,24 +853,24 @@ 
 	 */
 	public function supportCustomUrl($getItems)
 	{
-		if(!$this->_customUrl || $this->getPattern()===null)
+		if (!$this->_customUrl || $this->getPattern() === null)
 			return false;
 		if ($this->_parameters)
 		{
-			foreach($this->_parameters as $key=>$value)
+			foreach ($this->_parameters as $key=>$value)
 			{
-				if(!isset($getItems[$key]))
+				if (!isset($getItems[$key]))
 					return false;
 			}
 		}
 
 		if ($this->_constants)
 		{
-			foreach($this->_constants->toArray() as $key=>$value)
+			foreach ($this->_constants->toArray() as $key=>$value)
 			{
 				if (!isset($getItems[$key]))
 					return false;
-				if ($getItems[$key]!=$value)
+				if ($getItems[$key] != $value)
 					return false;
 			}
 		}
@@ -885,68 +885,68 @@ 
 	 * @return string the constructed URL
 	 * @since 3.1.1
 	 */
-	public function constructUrl($getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		if ($this->_constants)
 		{
-			foreach($this->_constants->toArray() as $key=>$value)
+			foreach ($this->_constants->toArray() as $key=>$value)
 			{
 				unset($getItems[$key]);
 			}
 		}
 
-		$extra=array();
-		$replace=array();
+		$extra = array();
+		$replace = array();
 		// for the GET variables matching the pattern, put them in the URL path
-		foreach($getItems as $key=>$value)
+		foreach ($getItems as $key=>$value)
 		{
-			if(($this->_parameters && $this->_parameters->contains($key)) || ($key==='*' && $this->getIsWildCardPattern()))
-				$replace['{'.$key.'}']=$encodeGetItems ? rawurlencode($value) : $value;
+			if (($this->_parameters && $this->_parameters->contains($key)) || ($key === '*' && $this->getIsWildCardPattern()))
+				$replace['{' . $key . '}'] = $encodeGetItems ? rawurlencode($value) : $value;
 			else
-				$extra[$key]=$value;
+				$extra[$key] = $value;
 		}
 
-		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(),$replace),'/');
+		$url = $this->_manager->getUrlPrefix() . '/' . ltrim(strtr($this->getPattern(), $replace), '/');
 
 		// for the rest of the GET variables, put them in the query string
-		if(count($extra)>0)
+		if (count($extra) > 0)
 		{
-			if ($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
+			if ($this->_urlFormat === THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
 				foreach ($extra as $name=>$value)
-					$url.='/'.$name.$this->_separator.($encodeGetItems?rawurlencode($value):$value);
+					$url .= '/' . $name . $this->_separator . ($encodeGetItems ? rawurlencode($value) : $value);
 				return $url;
 			}
 
-			$url2='';
-			$amp=$encodeAmpersand?'&amp;':'&';
-			if($encodeGetItems)
+			$url2 = '';
+			$amp = $encodeAmpersand ? '&amp;' : '&';
+			if ($encodeGetItems)
 			{
-				foreach($extra as $name=>$value)
+				foreach ($extra as $name=>$value)
 				{
-					if(is_array($value))
+					if (is_array($value))
 					{
-						$name=rawurlencode($name.'[]');
-						foreach($value as $v)
-							$url2.=$amp.$name.'='.rawurlencode($v);
+						$name = rawurlencode($name . '[]');
+						foreach ($value as $v)
+							$url2 .= $amp . $name . '=' . rawurlencode($v);
 					}
 					else
-						$url2.=$amp.rawurlencode($name).'='.rawurlencode($value);
+						$url2 .= $amp . rawurlencode($name) . '=' . rawurlencode($value);
 				}
 			}
 			else
 			{
-				foreach($extra as $name=>$value)
+				foreach ($extra as $name=>$value)
 				{
-					if(is_array($value))
+					if (is_array($value))
 					{
-						foreach($value as $v)
-							$url2.=$amp.$name.'[]='.$v;
+						foreach ($value as $v)
+							$url2 .= $amp . $name . '[]=' . $v;
 					}
 					else
-						$url2.=$amp.$name.'='.$value;
+						$url2 .= $amp . $name . '=' . $value;
 				}
 			}
-			$url=$url.'?'.substr($url2,strlen($amp));
+			$url = $url . '?' . substr($url2, strlen($amp));
 		}
 		return $this -> applySecureConnectionPrefix($url);
 	}
@@ -962,19 +962,19 @@ 
 	protected function applySecureConnectionPrefix($url)
 	{
 		static $request;
-		if($request === null) $request = Prado::getApplication() -> getRequest();
+		if ($request === null) $request = Prado::getApplication() -> getRequest();
 
 		static $isSecureConnection;
-		if($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
+		if ($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
 
-		switch($this -> getSecureConnection())
+		switch ($this -> getSecureConnection())
 		{
 			case TUrlMappingPatternSecureConnection::EnableIfNotSecure:
-				if($isSecureConnection) return $url;
+				if ($isSecureConnection) return $url;
 				return $request -> getBaseUrl(true) . $url;
 			break;
 			case TUrlMappingPatternSecureConnection::DisableIfSecure:
-				if(!$isSecureConnection) return $url;
+				if (!$isSecureConnection) return $url;
 				return $request -> getBaseUrl(false) . $url;
 			break;
 			case TUrlMappingPatternSecureConnection::Enable:

Braces +115 added lines, -84 removed lines

@@ -101,10 +101,12 @@ 
 	public function init($config)
 	{
 		parent::init($config);
-		if($this->getRequest()->getRequestResolved())
-			throw new TConfigurationException('urlmapping_global_required');
-		if($this->_configFile!==null)
-			$this->loadConfigFile();
+		if($this->getRequest()->getRequestResolved()) {
+					throw new TConfigurationException('urlmapping_global_required');
+		}
+		if($this->_configFile!==null) {
+					$this->loadConfigFile();
+		}
 		$this->loadUrlMappings($config);
 		if($this->_urlPrefix==='')
 		{
@@ -131,16 +133,15 @@ 
 			{
 				$config = include $this->_configFile;
 				$this->loadUrlMappings($dom);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadUrlMappings($dom);
 			}
+		} else {
+					throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
 		}
-		else
-			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
 	}
 
 	/**
@@ -201,8 +202,9 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,$this->getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('urlmapping_configfile_invalid',$value);
+		if(($this->_configFile=Prado::getPathOfNamespace($value,$this->getApplication()->getConfigurationFileExt()))===null) {
+					throw new TConfigurationException('urlmapping_configfile_invalid',$value);
+		}
 	}
 
 	/**
@@ -246,14 +248,14 @@ 
 					$this->buildUrlMapping($class,$properties,$url);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('url') as $url)
 			{
 				$properties=$url->getAttributes();
-				if(($class=$properties->remove('class'))===null)
-					$class=$defaultClass;
+				if(($class=$properties->remove('class'))===null) {
+									$class=$defaultClass;
+				}
 				$this->buildUrlMapping($class,$properties,$url);
 			}
 		}
@@ -262,23 +264,26 @@ 
 	private function buildUrlMapping($class, $properties, $url)
 	{
 		$pattern=Prado::createComponent($class,$this);
-		if(!($pattern instanceof TUrlMappingPattern))
-			throw new TConfigurationException('urlmapping_urlmappingpattern_required');
-		foreach($properties as $name=>$value)
-			$pattern->setSubproperty($name,$value);
+		if(!($pattern instanceof TUrlMappingPattern)) {
+					throw new TConfigurationException('urlmapping_urlmappingpattern_required');
+		}
+		foreach($properties as $name=>$value) {
+					$pattern->setSubproperty($name,$value);
+		}
 
 		if($url instanceof TXmlElement) {
 			$text = $url -> getValue();
 			if($text) {
 				$text = preg_replace('/(\s+)/S', '', $text);
-				if(($regExp = $pattern->getRegularExpression()) !== '')
-				trigger_error(sPrintF('%s.RegularExpression property value "%s" for ServiceID="%s" and ServiceParameter="%s" was replaced by node value "%s"',
+				if(($regExp = $pattern->getRegularExpression()) !== '') {
+								trigger_error(sPrintF('%s.RegularExpression property value "%s" for ServiceID="%s" and ServiceParameter="%s" was replaced by node value "%s"',
 				get_class($pattern),
 				$regExp,
 				$pattern->getServiceID(),
 				$pattern->getServiceParameter(),
 				$text),
 				E_USER_NOTICE);
+				}
 				$pattern->setRegularExpression($text);
 			}
 		}
@@ -310,11 +315,13 @@ 
 				$params=array();
 				foreach($matches as $key=>$value)
 				{
-					if(is_string($key))
-						$params[$key]=$value;
+					if(is_string($key)) {
+											$params[$key]=$value;
+					}
+				}
+				if (!$pattern->getIsWildCardPattern()) {
+									$params[$pattern->getServiceID()]=$pattern->getServiceParameter();
 				}
-				if (!$pattern->getIsWildCardPattern())
-					$params[$pattern->getServiceID()]=$pattern->getServiceParameter();
 				return $params;
 			}
 		}
@@ -349,8 +356,9 @@ 
 	{
 		if($this->_customUrl)
 		{
-			if(!(is_array($getItems) || ($getItems instanceof Traversable)))
-				$getItems=array();
+			if(!(is_array($getItems) || ($getItems instanceof Traversable))) {
+							$getItems=array();
+			}
 			$key=$serviceID.':'.$serviceParam;
 			$wildCardKey = ($pos=strrpos($serviceParam,'.'))!==false ?
 				$serviceID.':'.substr($serviceParam,0,$pos).'.*' : $serviceID.':*';
@@ -358,11 +366,11 @@ 
 			{
 				foreach($this->_constructRules[$key] as $rule)
 				{
-					if($rule->supportCustomUrl($getItems))
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+					if($rule->supportCustomUrl($getItems)) {
+											return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+					}
 				}
-			}
-			elseif(isset($this->_constructRules[$wildCardKey]))
+			} elseif(isset($this->_constructRules[$wildCardKey]))
 			{
 				foreach($this->_constructRules[$wildCardKey] as $rule)
 				{
@@ -554,10 +562,12 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_serviceParameter===null)
-			throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
-		if(strpos($this->_serviceParameter,'*')!==false)
-				$this->_isWildCardPattern=true;
+		if($this->_serviceParameter===null) {
+					throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
+		}
+		if(strpos($this->_serviceParameter,'*')!==false) {
+						$this->_isWildCardPattern=true;
+		}
 	}
 
 	/**
@@ -586,13 +596,15 @@ 
 		$params[]='/';
 		$values[]='\\/';
 		$regexp=str_replace($params,$values,trim($this->getPattern(),'/').'/');
-		if ($this->_urlFormat===THttpRequestUrlFormat::Get)
-				$regexp='/^'.$regexp.'$/u';
-		else
-				$regexp='/^'.$regexp.'(?P<urlparams>.*)$/u';
+		if ($this->_urlFormat===THttpRequestUrlFormat::Get) {
+						$regexp='/^'.$regexp.'$/u';
+		} else {
+						$regexp='/^'.$regexp.'(?P<urlparams>.*)$/u';
+		}
 
-		if(!$this->getCaseSensitive())
-			$regexp.='i';
+		if(!$this->getCaseSensitive()) {
+					$regexp.='i';
+		}
 		return $regexp;
 	}
 
@@ -720,23 +732,25 @@ 
 	public function getPatternMatches($request)
 	{
 		$matches=array();
-		if(($pattern=$this->getRegularExpression())!=='')
-			preg_match($pattern,$request->getPathInfo(),$matches);
-		else
-			preg_match($this->getParameterizedPattern(),trim($request->getPathInfo(),'/').'/',$matches);
+		if(($pattern=$this->getRegularExpression())!=='') {
+					preg_match($pattern,$request->getPathInfo(),$matches);
+		} else {
+					preg_match($this->getParameterizedPattern(),trim($request->getPathInfo(),'/').'/',$matches);
+		}
 
-		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
-			$matches[$this->_serviceID]=str_replace('*',$matches[$this->_serviceID],$this->_serviceParameter);
+		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID])) {
+					$matches[$this->_serviceID]=str_replace('*',$matches[$this->_serviceID],$this->_serviceParameter);
+		}
 
 		if (isset($matches['urlparams']))
 		{
 			$params=explode('/',$matches['urlparams']);
 			if ($this->_separator==='/')
 			{
-				while($key=array_shift($params))
-					$matches[$key]=($value=array_shift($params)) ? $value : '';
-			}
-			else
+				while($key=array_shift($params)) {
+									$matches[$key]=($value=array_shift($params)) ? $value : '';
+				}
+			} else
 			{
 				array_pop($params);
 				foreach($params as $param)
@@ -750,8 +764,9 @@ 
 
 		if(count($matches) > 0 && $this->_constants)
 		{
-			foreach($this->_constants->toArray() as $key=>$value)
-				$matches[$key] = $value;
+			foreach($this->_constants->toArray() as $key=>$value) {
+							$matches[$key] = $value;
+			}
 		}
 
 		return $matches;
@@ -822,10 +837,11 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value)===1)
-			$this->_separator=$value;
-		else
-			throw new TInvalidDataValueException('httprequest_separator_invalid');
+		if(strlen($value)===1) {
+					$this->_separator=$value;
+		} else {
+					throw new TInvalidDataValueException('httprequest_separator_invalid');
+		}
 	}
 
 	/**
@@ -853,14 +869,16 @@ 
 	 */
 	public function supportCustomUrl($getItems)
 	{
-		if(!$this->_customUrl || $this->getPattern()===null)
-			return false;
+		if(!$this->_customUrl || $this->getPattern()===null) {
+					return false;
+		}
 		if ($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
-				if(!isset($getItems[$key]))
-					return false;
+				if(!isset($getItems[$key])) {
+									return false;
+				}
 			}
 		}
 
@@ -868,10 +886,12 @@ 
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
 			{
-				if (!isset($getItems[$key]))
-					return false;
-				if ($getItems[$key]!=$value)
-					return false;
+				if (!isset($getItems[$key])) {
+									return false;
+				}
+				if ($getItems[$key]!=$value) {
+									return false;
+				}
 			}
 		}
 		return true;
@@ -900,10 +920,11 @@ 
 		// for the GET variables matching the pattern, put them in the URL path
 		foreach($getItems as $key=>$value)
 		{
-			if(($this->_parameters && $this->_parameters->contains($key)) || ($key==='*' && $this->getIsWildCardPattern()))
-				$replace['{'.$key.'}']=$encodeGetItems ? rawurlencode($value) : $value;
-			else
-				$extra[$key]=$value;
+			if(($this->_parameters && $this->_parameters->contains($key)) || ($key==='*' && $this->getIsWildCardPattern())) {
+							$replace['{'.$key.'}']=$encodeGetItems ? rawurlencode($value) : $value;
+			} else {
+							$extra[$key]=$value;
+			}
 		}
 
 		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(),$replace),'/');
@@ -912,8 +933,9 @@ 
 		if(count($extra)>0)
 		{
 			if ($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
-				foreach ($extra as $name=>$value)
-					$url.='/'.$name.$this->_separator.($encodeGetItems?rawurlencode($value):$value);
+				foreach ($extra as $name=>$value) {
+									$url.='/'.$name.$this->_separator.($encodeGetItems?rawurlencode($value):$value);
+				}
 				return $url;
 			}
 
@@ -926,24 +948,25 @@ 
 					if(is_array($value))
 					{
 						$name=rawurlencode($name.'[]');
-						foreach($value as $v)
-							$url2.=$amp.$name.'='.rawurlencode($v);
+						foreach($value as $v) {
+													$url2.=$amp.$name.'='.rawurlencode($v);
+						}
+					} else {
+											$url2.=$amp.rawurlencode($name).'='.rawurlencode($value);
 					}
-					else
-						$url2.=$amp.rawurlencode($name).'='.rawurlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($extra as $name=>$value)
 				{
 					if(is_array($value))
 					{
-						foreach($value as $v)
-							$url2.=$amp.$name.'[]='.$v;
+						foreach($value as $v) {
+													$url2.=$amp.$name.'[]='.$v;
+						}
+					} else {
+											$url2.=$amp.$name.'='.$value;
 					}
-					else
-						$url2.=$amp.$name.'='.$value;
 				}
 			}
 			$url=$url.'?'.substr($url2,strlen($amp));
@@ -962,19 +985,27 @@ 
 	protected function applySecureConnectionPrefix($url)
 	{
 		static $request;
-		if($request === null) $request = Prado::getApplication() -> getRequest();
+		if($request === null) {
+			$request = Prado::getApplication() -> getRequest();
+		}
 
 		static $isSecureConnection;
-		if($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
+		if($isSecureConnection === null) {
+			$isSecureConnection = $request -> getIsSecureConnection();
+		}
 
 		switch($this -> getSecureConnection())
 		{
 			case TUrlMappingPatternSecureConnection::EnableIfNotSecure:
-				if($isSecureConnection) return $url;
+				if($isSecureConnection) {
+					return $url;
+				}
 				return $request -> getBaseUrl(true) . $url;
 			break;
 			case TUrlMappingPatternSecureConnection::DisableIfSecure:
-				if(!$isSecureConnection) return $url;
+				if(!$isSecureConnection) {
+					return $url;
+				}
 				return $request -> getBaseUrl(false) . $url;
 			break;
 			case TUrlMappingPatternSecureConnection::Enable:

framework/Web/UI/ActiveControls/TActiveCustomValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
 	}
 
 	/**
-	 * @return boolean true to observe changes.
+	 * @return boolean|string true to observe changes.
 	 */
 	public function getObserveChanges()
 	{

Spacing +4 added lines, -4 removed lines

@@ -105,7 +105,7 @@ 
 	public function setIsValid($value)
 	{
 		parent::setIsValid($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
 			$client = $this->getPage()->getCallbackClient();
 			$func = 'Prado.Validation.updateActiveCustomValidator';
@@ -131,7 +131,7 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options=TBaseValidator::getClientScriptOptions();
+		$options = TBaseValidator::getClientScriptOptions();
 		$options['EventTarget'] = $this->getUniqueID();
 		return $options;
 	}
@@ -143,7 +143,7 @@ 
 	public function setErrorMessage($value)
 	{
 		parent::setErrorMessage($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
 			$client = $this->getPage()->getCallbackClient();
 			$func = 'Prado.Validation.setErrorMessage';
@@ -257,6 +257,6 @@ 
 	public function getObserveChanges()
 	{
 		$changes = $this->getOption('ObserveChanges');
-		return ($changes===null) ? true : $changes;
+		return ($changes === null) ? true : $changes;
 	}
 }

framework/Web/UI/ActiveControls/TActiveListBox.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 	/**
 	 * Javascript client class for this control.
 	 * This method overrides the parent implementation.
-	 * @return null no javascript class name.
+	 * @return string no javascript class name.
 	 */
 	protected function getClientClassName()
 	{

Spacing +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
 	 */
 	protected function createListItemCollection()
 	{
-		$collection  = new TActiveListItemCollection;
+		$collection = new TActiveListItemCollection;
 		$collection->setControl($this);
 		return $collection;
 	}
@@ -87,8 +87,8 @@ 
 	{
 		parent::setSelectionMode($value);
 		$multiple = $this->getIsMultiSelect();
-		$id = $this->getUniqueID(); $multi_id = $id.'[]';
-		if($this->getActiveControl()->canUpdateClientSide())
+		$id = $this->getUniqueID(); $multi_id = $id . '[]';
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
 			$client = $this->getPage()->getCallbackClient();
 			$client->setAttribute($this, 'multiple', $multiple ? 'multiple' : false);
@@ -143,7 +143,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		if ($this->getAutoPostBack())
 			$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());

Braces +3 added lines, -2 removed lines

@@ -144,9 +144,10 @@
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id',$this->getClientID());
-		if ($this->getAutoPostBack())
-			$this->getActiveControl()->registerCallbackClientScript(
+		if ($this->getAutoPostBack()) {
+					$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
+		}
 	}
 }
 

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TActiveListBox class file.
- *
- * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TActiveListBox class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 /**
  * Load active list control adapter

framework/Web/UI/ActiveControls/TActivePageAdapter.php

Doc Comments +2 added lines

@@ -228,6 +228,8 @@
 
 	/**
 	 * Appends data or javascript code to the body content surrounded with delimiters
+	 * @param THttpResponse $response
+	 * @param string $delimiter
 	 */
 	private function appendContentPart($response, $delimiter, $data)
 	{

Spacing +45 added lines, -45 removed lines

@@ -80,7 +80,7 @@ 
 	 */
 	private $_callbackClient;
 
-	private $_controlsToRender=array();
+	private $_controlsToRender = array();
 
 	/**
 	 * Constructor, trap errors and exception to let the callback response
@@ -103,7 +103,7 @@ 
 	 */
 	public function processCallbackEvent($writer)
 	{
-		Prado::trace("ActivePage raiseCallbackEvent()",'System.Web.UI.ActiveControls.TActivePageAdapter');
+		Prado::trace("ActivePage raiseCallbackEvent()", 'System.Web.UI.ActiveControls.TActivePageAdapter');
 		$this->raiseCallbackEvent();
 	}
 
@@ -112,11 +112,11 @@ 
 	 * @param TControl control for defered rendering
 	 * @param THtmlWriter the renderer
 	 */
-	public function registerControlToRender($control,$writer)
+	public function registerControlToRender($control, $writer)
 	{
 		$id = $control->getUniqueID();
-		if(!isset($this->_controlsToRender[$id]))
-			$this->_controlsToRender[$id] = array($control,$writer);
+		if (!isset($this->_controlsToRender[$id]))
+			$this->_controlsToRender[$id] = array($control, $writer);
 	}
 
 	/**
@@ -133,8 +133,8 @@ 
 	 */
 	public function renderCallbackResponse($writer)
 	{
-		Prado::trace("ActivePage renderCallbackResponse()",'System.Web.UI.ActiveControls.TActivePageAdapter');
-		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl())===null)
+		Prado::trace("ActivePage renderCallbackResponse()", 'System.Web.UI.ActiveControls.TActivePageAdapter');
+		if (($url = $this->getResponse()->getAdapter()->getRedirectedUrl()) === null)
 			$this->renderResponse($writer);
 		else
 			$this->redirect($url);
@@ -146,7 +146,7 @@ 
 	 */
 	protected function redirect($url)
 	{
-		Prado::trace("ActivePage redirect()",'System.Web.UI.ActiveControls.TActivePageAdapter');
+		Prado::trace("ActivePage redirect()", 'System.Web.UI.ActiveControls.TActivePageAdapter');
 		$this->appendContentPart($this->getResponse(), self::CALLBACK_REDIRECT, $url);
 	}
 
@@ -157,18 +157,18 @@ 
 	 */
 	protected function renderResponse($writer)
 	{
-		Prado::trace("ActivePage renderResponse()",'System.Web.UI.ActiveControls.TActivePageAdapter');
+		Prado::trace("ActivePage renderResponse()", 'System.Web.UI.ActiveControls.TActivePageAdapter');
 		//renders all the defered render() calls.
-		foreach($this->_controlsToRender as $rid => $forRender)
+		foreach ($this->_controlsToRender as $rid => $forRender)
 			$forRender[0]->render($forRender[1]);
 
 		$response = $this->getResponse();
 
 		//send response data in header
-		if($response->getHasAdapter())
+		if ($response->getHasAdapter())
 		{
 			$responseData = $response->getAdapter()->getResponseData();
-			if($responseData!==null)
+			if ($responseData !== null)
 			{
 				$data = TJavaScript::jsonEncode($responseData);
 
@@ -177,9 +177,9 @@ 
 		}
 
 		//sends page state in header
-		if(($handler = $this->getCallbackEventTarget()) !== null)
+		if (($handler = $this->getCallbackEventTarget()) !== null)
 		{
-			if($handler->getActiveControl()->getClientSide()->getEnablePageStateUpdate())
+			if ($handler->getActiveControl()->getClientSide()->getEnablePageStateUpdate())
 			{
 				$pagestate = $this->getPage()->getClientState();
 				$this->appendContentPart($response, self::CALLBACK_PAGESTATE_HEADER, $pagestate);
@@ -190,7 +190,7 @@ 
 		$writer->write(" ");
 
 		//output the end javascript
-		if($this->getPage()->getClientScript()->hasEndScripts())
+		if ($this->getPage()->getClientScript()->hasEndScripts())
 		{
 			$writer = $response->createHtmlWriter();
 			$this->getPage()->getClientScript()->renderEndScriptsCallback($writer);
@@ -207,22 +207,22 @@ 
 
 		// collect all stylesheet file references
 		$stylesheets = $cs->getStyleSheetUrls();
-		if (count($stylesheets)>0)
+		if (count($stylesheets) > 0)
 		$this->appendContentPart($response, self::CALLBACK_STYLESHEETLIST_HEADER, TJavaScript::jsonEncode($stylesheets));
 
 		// collect all stylesheet snippets references
 		$stylesheets = $cs->getStyleSheetCodes();
-		if (count($stylesheets)>0)
+		if (count($stylesheets) > 0)
 		$this->appendContentPart($response, self::CALLBACK_STYLESHEET_HEADER, TJavaScript::jsonEncode($stylesheets));
 
 		// collect all script file references
 		$scripts = $cs->getScriptUrls();
-		if (count($scripts)>0)
+		if (count($scripts) > 0)
 		$this->appendContentPart($response, self::CALLBACK_SCRIPTLIST_HEADER, TJavaScript::jsonEncode($scripts));
 
 		// collect all hidden field references
 		$fields = $cs->getHiddenFields();
-		if (count($fields)>0)
+		if (count($fields) > 0)
 		$this->appendContentPart($response, self::CALLBACK_HIDDENFIELDLIST_HEADER, TJavaScript::jsonEncode($fields));
 	}
 
@@ -244,9 +244,9 @@ 
 	 */
 	private function raiseCallbackEvent()
 	{
-		 if(($callbackHandler=$this->getCallbackEventTarget())!==null)
+		 if (($callbackHandler = $this->getCallbackEventTarget()) !== null)
 		 {
-			if($callbackHandler instanceof ICallbackEventHandler)
+			if ($callbackHandler instanceof ICallbackEventHandler)
 			{
 				$param = $this->getCallbackEventParameter();
 				$result = new TCallbackEventParameter($this->getResponse(), $param);
@@ -271,11 +271,11 @@ 
 	 */
 	public function getCallbackEventTarget()
 	{
-		if($this->_callbackEventTarget===null)
+		if ($this->_callbackEventTarget === null)
 		{
-			$eventTarget=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
-			if(!empty($eventTarget))
-				$this->_callbackEventTarget=$this->getPage()->findControl($eventTarget);
+			$eventTarget = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
+			if (!empty($eventTarget))
+				$this->_callbackEventTarget = $this->getPage()->findControl($eventTarget);
 		}
 		return $this->_callbackEventTarget;
 	}
@@ -286,7 +286,7 @@ 
 	 */
 	public function setCallbackEventTarget(TControl $control)
 	{
-		$this->_callbackEventTarget=$control;
+		$this->_callbackEventTarget = $control;
 	}
 
 	/**
@@ -295,10 +295,10 @@ 
 	 */
 	public function getCallbackEventParameter()
 	{
-		if($this->_callbackEventParameter===null)
+		if ($this->_callbackEventParameter === null)
 		{
 			$param = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-			$this->_callbackEventParameter=$param;
+			$this->_callbackEventParameter = $param;
 		}
 		return $this->_callbackEventParameter;
 	}
@@ -308,7 +308,7 @@ 
 	 */
 	public function setCallbackEventParameter($value)
 	{
-		$this->_callbackEventParameter=$value;
+		$this->_callbackEventParameter = $value;
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	 */
 	public function getCallbackClientHandler()
 	{
-		if($this->_callbackClient===null)
+		if ($this->_callbackClient === null)
 			$this->_callbackClient = new TCallbackClientScript;
 		return $this->_callbackClient;
 	}
@@ -345,7 +345,7 @@ 
 	 */
 	protected function displayException($exception)
 	{
-		if($this->getApplication()->getMode()===TApplication::STATE_DEBUG)
+		if ($this->getApplication()->getMode() === TApplication::STATE_DEBUG)
 		{
 			$response = $this->getApplication()->getResponse();
 			$trace = $this->getExceptionStackTrace($exception);
@@ -354,7 +354,7 @@ 
 				$trace = TJavaScript::jsonEncode($trace);
 			} catch (Exception $e) {
 				// strip everythin not 7bit ascii
-				$trace = preg_replace('/[^(\x20-\x7F)]*/','', serialize($trace));
+				$trace = preg_replace('/[^(\x20-\x7F)]*/', '', serialize($trace));
 			}
 
 			// avoid exception loop if headers have already been sent
@@ -368,7 +368,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();
@@ -380,24 +380,24 @@ 
 	 */
 	private function getExceptionStackTrace($exception)
 	{
-		$data['code']=$exception->getCode() > 0 ? $exception->getCode() : 500;
-		$data['file']=$exception->getFile();
-		$data['line']=$exception->getLine();
-		$data['trace']=$exception->getTrace();
-		if($exception instanceof TPhpErrorException)
+		$data['code'] = $exception->getCode() > 0 ? $exception->getCode() : 500;
+		$data['file'] = $exception->getFile();
+		$data['line'] = $exception->getLine();
+		$data['trace'] = $exception->getTrace();
+		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'];
+				$data['file'] = $trace[0]['file'];
+				$data['line'] = $trace[0]['line'];
 			}
 		}
-		$data['type']=get_class($exception);
-		$data['message']=$exception->getMessage();
-		$data['version']=$_SERVER['SERVER_SOFTWARE'].' '.Prado::getVersion();
-		$data['time']=@strftime('%Y-%m-%d %H:%M',time());
+		$data['type'] = get_class($exception);
+		$data['message'] = $exception->getMessage();
+		$data['version'] = $_SERVER['SERVER_SOFTWARE'] . ' ' . Prado::getVersion();
+		$data['time'] = @strftime('%Y-%m-%d %H:%M', time());
 		return $data;
 	}
 }

Braces +32 added lines, -26 removed lines

@@ -115,8 +115,9 @@ 
 	public function registerControlToRender($control,$writer)
 	{
 		$id = $control->getUniqueID();
-		if(!isset($this->_controlsToRender[$id]))
-			$this->_controlsToRender[$id] = array($control,$writer);
+		if(!isset($this->_controlsToRender[$id])) {
+					$this->_controlsToRender[$id] = array($control,$writer);
+		}
 	}
 
 	/**
@@ -134,10 +135,11 @@ 
 	public function renderCallbackResponse($writer)
 	{
 		Prado::trace("ActivePage renderCallbackResponse()",'System.Web.UI.ActiveControls.TActivePageAdapter');
-		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl())===null)
-			$this->renderResponse($writer);
-		else
-			$this->redirect($url);
+		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl())===null) {
+					$this->renderResponse($writer);
+		} else {
+					$this->redirect($url);
+		}
 	}
 
 	/**
@@ -159,8 +161,9 @@ 
 	{
 		Prado::trace("ActivePage renderResponse()",'System.Web.UI.ActiveControls.TActivePageAdapter');
 		//renders all the defered render() calls.
-		foreach($this->_controlsToRender as $rid => $forRender)
-			$forRender[0]->render($forRender[1]);
+		foreach($this->_controlsToRender as $rid => $forRender) {
+					$forRender[0]->render($forRender[1]);
+		}
 
 		$response = $this->getResponse();
 
@@ -207,23 +210,27 @@ 
 
 		// collect all stylesheet file references
 		$stylesheets = $cs->getStyleSheetUrls();
-		if (count($stylesheets)>0)
-		$this->appendContentPart($response, self::CALLBACK_STYLESHEETLIST_HEADER, TJavaScript::jsonEncode($stylesheets));
+		if (count($stylesheets)>0) {
+				$this->appendContentPart($response, self::CALLBACK_STYLESHEETLIST_HEADER, TJavaScript::jsonEncode($stylesheets));
+		}
 
 		// collect all stylesheet snippets references
 		$stylesheets = $cs->getStyleSheetCodes();
-		if (count($stylesheets)>0)
-		$this->appendContentPart($response, self::CALLBACK_STYLESHEET_HEADER, TJavaScript::jsonEncode($stylesheets));
+		if (count($stylesheets)>0) {
+				$this->appendContentPart($response, self::CALLBACK_STYLESHEET_HEADER, TJavaScript::jsonEncode($stylesheets));
+		}
 
 		// collect all script file references
 		$scripts = $cs->getScriptUrls();
-		if (count($scripts)>0)
-		$this->appendContentPart($response, self::CALLBACK_SCRIPTLIST_HEADER, TJavaScript::jsonEncode($scripts));
+		if (count($scripts)>0) {
+				$this->appendContentPart($response, self::CALLBACK_SCRIPTLIST_HEADER, TJavaScript::jsonEncode($scripts));
+		}
 
 		// collect all hidden field references
 		$fields = $cs->getHiddenFields();
-		if (count($fields)>0)
-		$this->appendContentPart($response, self::CALLBACK_HIDDENFIELDLIST_HEADER, TJavaScript::jsonEncode($fields));
+		if (count($fields)>0) {
+				$this->appendContentPart($response, self::CALLBACK_HIDDENFIELDLIST_HEADER, TJavaScript::jsonEncode($fields));
+		}
 	}
 
 	/**
@@ -251,14 +258,12 @@ 
 				$param = $this->getCallbackEventParameter();
 				$result = new TCallbackEventParameter($this->getResponse(), $param);
 				$callbackHandler->raiseCallbackEvent($result);
-			}
-			else
+			} else
 			{
 				throw new TInvalidCallbackException(
 					'callback_invalid_handler', $callbackHandler->getUniqueID());
 			}
-		 }
-		 else
+		 } else
 		 {
 		 	$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
 		 	throw new TInvalidCallbackException('callback_invalid_target', $target);
@@ -274,8 +279,9 @@ 
 		if($this->_callbackEventTarget===null)
 		{
 			$eventTarget=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
-			if(!empty($eventTarget))
-				$this->_callbackEventTarget=$this->getPage()->findControl($eventTarget);
+			if(!empty($eventTarget)) {
+							$this->_callbackEventTarget=$this->getPage()->findControl($eventTarget);
+			}
 		}
 		return $this->_callbackEventTarget;
 	}
@@ -318,8 +324,9 @@ 
 	 */
 	public function getCallbackClientHandler()
 	{
-		if($this->_callbackClient===null)
-			$this->_callbackClient = new TCallbackClientScript;
+		if($this->_callbackClient===null) {
+					$this->_callbackClient = new TCallbackClientScript;
+		}
 		return $this->_callbackClient;
 	}
 }
@@ -365,8 +372,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);

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * TActivePageAdapter, TCallbackErrorHandler and TInvalidCallbackException class file.
- *
- * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @author Gabor Berczi <gabor.berczi@devworx.hu> (lazyload additions & progressive rendering)
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TActivePageAdapter, TCallbackErrorHandler and TInvalidCallbackException class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
+	 * @author Gabor Berczi <gabor.berczi@devworx.hu> (lazyload additions & progressive rendering)
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 /**
  * Load callback response adapter class.