pradosoft / prado

framework/Web/THttpResponse.php

Spacing +49 added lines, -49 removed lines

@@ -64,13 +64,13 @@ 
  */
 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}
 	 */
-	private static $HTTP_STATUS_CODES = array(
+	private static $HTTP_STATUS_CODES=array(
 		100 => 'Continue', 101 => 'Switching Protocols',
 		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content',
 		300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect',
@@ -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')));
 	}
 
 	/**
@@ -209,9 +209,9 @@ 
 	 */
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
+		if($this->_contentTypeHeaderSent)
 			throw new Exception('Unable to alter content-type as it has been already sent');
-		$this->_contentType = $type;
+		$this->_contentType=$type;
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset=(strToLower($charset)==='false') ? false : (string) $charset;
 	}
 
 	/**
@@ -276,12 +276,12 @@ 
 	 */
 	public function setStatusCode($status, $reason=null)
 	{
-		if ($this->_httpHeaderSent)
+		if($this->_httpHeaderSent)
 			throw new Exception('Unable to alter response as HTTP header already sent');
 		$status=TPropertyValue::ensureInteger($status);
 		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");
 			}
@@ -319,7 +319,7 @@ 
 	public function write($str)
 	{
 		// when starting output make sure we send the headers first
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
+		if(!$this->_bufferOutput and !$this->_httpHeaderSent)
 			$this->ensureHeadersSent();
 		echo $str;
 	}
@@ -336,7 +336,7 @@ 
 	 * @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(
 			'css'=>'text/css',
@@ -356,9 +356,9 @@ 
 			$mimeType='text/plain';
 			if(function_exists('mime_content_type'))
 				$mimeType=mime_content_type($fileName);
-			else if(($ext=strrchr($fileName,'.'))!==false)
+			else if(($ext=strrchr($fileName, '.'))!==false)
 			{
-				$ext=substr($ext,1);
+				$ext=substr($ext, 1);
 				if(isset($defaultMimeTypes[$ext]))
 					$mimeType=$defaultMimeTypes[$ext];
 			}
@@ -370,7 +370,7 @@ 
 			$clientFileName=basename($clientFileName);
 
 		if($fileSize===null || $fileSize < 0)
-			$fileSize = ($content===null?filesize($fileName):strlen($content));
+			$fileSize=($content===null ? filesize($fileName) : strlen($content));
 
 		$this->sendHttpHeader();
 		if(is_array($headers))
@@ -384,11 +384,11 @@ 
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header("Content-Type: $mimeType");
-			$this->_contentTypeHeaderSent = true;
+			$this->_contentTypeHeaderSent=true;
 		}
 
 		header('Content-Length: '.$fileSize);
-		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
 		if($content===null)
 			readfile($fileName);
@@ -428,25 +428,25 @@ 
 
 		// Under IIS, explicitly send an HTTP response including the status code
 		// this is handled automatically by PHP on Apache and others
-		$isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false);
+		$isIIS=(stripos($this->getRequest()->getServerSoftware(), "microsoft-iis")!==false);
 		if($url[0]==='/')
 			$url=$this->getRequest()->getBaseUrl().$url;
-		if ($this->_status >= 300 && $this->_status < 400)
+		if($this->_status >= 300 && $this->_status < 400)
 		{
 			// The status code has been modified to a valid redirection status, send it
 			if($isIIS)
 			{
-				header('HTTP/1.1 ' . $this->_status . ' ' . self::$HTTP_STATUS_CODES[
+				header('HTTP/1.1 '.$this->_status.' '.self::$HTTP_STATUS_CODES[
 					array_key_exists($this->_status, self::$HTTP_STATUS_CODES)
 						? $this->_status
 						: 302
 					]);
 			}
-			header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
+			header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
 		} else {
 			if($isIIS)
 				header('HTTP/1.1 302 '.self::$HTTP_STATUS_CODES[302]);
-			header('Location: '.str_replace('&amp;','&',$url));
+			header('Location: '.str_replace('&amp;', '&', $url));
 		}
 
 		if(!$this->getApplication()->getRequestCompleted())
@@ -468,7 +468,7 @@ 
 	/**
 	 * Flush the response contents and headers.
 	 */
-	public function flush($continueBuffering = true)
+	public function flush($continueBuffering=true)
 	{
 		if($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
@@ -490,18 +490,18 @@ 
 	 * This method is used internally. Please use {@link flush} instead.
 	 * @param boolean whether to continue buffering after flush if buffering was active
 	 */
-	public function flushContent($continueBuffering = true)
+	public function flushContent($continueBuffering=true)
 	{
-		Prado::trace("Flushing output",'System.Web.THttpResponse');
+		Prado::trace("Flushing output", 'System.Web.THttpResponse');
 		$this->ensureHeadersSent();
 		if($this->_bufferOutput)
 		{
 			// avoid forced send of http headers (ob_flush() does that) if there's no output yet
-			if (ob_get_length()>0)
+			if(ob_get_length() > 0)
 			{
-				if (!$continueBuffering)
+				if(!$continueBuffering)
 				{
-					$this->_bufferOutput = false;
+					$this->_bufferOutput=false;
 					ob_end_flush();
 				}
 				else
@@ -518,7 +518,7 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
+		if(!$this->_httpHeaderSent)
 			$this->sendHttpHeader();
 	}
 
@@ -528,12 +528,12 @@ 
 	protected function sendHttpHeader()
 	{
 		$protocol=$this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
+		if($this->getRequest()->getHttpProtocolVersion()===null)
 			$protocol='HTTP/1.1';
 
 		header($protocol.' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
-		$this->_httpHeaderSent = true;
+		$this->_httpHeaderSent=true;
 	}
 
 	/**
@@ -541,7 +541,7 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
+		if(!$this->_contentTypeHeaderSent)
 			$this->sendContentTypeHeader();
 	}
 
@@ -550,9 +550,9 @@ 
 	 */
 	protected function sendContentTypeHeader()
 	{
-		$contentType=$this->_contentType===null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
+		$contentType=$this->_contentType===null ? self::DEFAULT_CONTENTTYPE : $this->_contentType;
 		$charset=$this->getCharset();
-		if($charset === false) {
+		if($charset===false) {
 			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
@@ -560,10 +560,10 @@ 
 		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;
+		$this->_contentTypeHeaderSent=true;
 	}
 
 	/**
@@ -574,8 +574,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() : '';
 	}
 
 	/**
@@ -585,7 +585,7 @@ 
 	{
 		if($this->_bufferOutput)
 			ob_clean();
-		Prado::trace("Clearing output",'System.Web.THttpResponse');
+		Prado::trace("Clearing output", 'System.Web.THttpResponse');
 	}
 
 	/**
@@ -594,19 +594,19 @@ 
 	 */
 	public function getHeaders($case=null)
 	{
-		$result = array();
-		$headers = headers_list();
+		$result=array();
+		$headers=headers_list();
 		foreach($headers as $header) {
-			$tmp = explode(':', $header);
-			$key = trim(array_shift($tmp));
-			$value = trim(implode(':', $tmp));
+			$tmp=explode(':', $header);
+			$key=trim(array_shift($tmp));
+			$value=trim(implode(':', $tmp));
 			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
+				$result[$key].=', '.$value;
 			else
-				$result[$key] = $value;
+				$result[$key]=$value;
 		}
 
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -619,7 +619,7 @@ 
 	 */
 	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);
 	}
 
@@ -632,9 +632,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);
 	}
 
 	/**