pradosoft / prado

framework/Web/UI/TPageStatePersister.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function save($state)
 	{
-		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page,$state));
+		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page, $state));
 	}
 
 	/**
@@ -60,10 +60,10 @@ 
 	 */
 	public function load()
 	{
-		if(($data=TPageStateFormatter::unserialize($this->_page,$this->_page->getRequestClientState()))!==null)
+		if(($data=TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState()))!==null)
 			return $data;
 		else
-			throw new THttpException(400,'pagestatepersister_pagestate_corrupted');
+			throw new THttpException(400, 'pagestatepersister_pagestate_corrupted');
 	}
 }
 

framework/Web/THttpUtility.php

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/prado.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 /**
  * Defines Prado class if not defined.
  */
-if(!class_exists('Prado',false))
+if(!class_exists('Prado', false))
 {
 	/**
 	 * Prado class.
@@ -45,7 +45,7 @@ 
  * cannot be found, if you have multiple autoloaders, Prado::autoload
  * should be registered in the last.
  */
-spl_autoload_register(array('Prado','autoload'));
+spl_autoload_register(array('Prado', 'autoload'));
 
 /**
  * Initializes error and exception handlers

framework/Util/TCallChain.php

Spacing +10 added lines, -10 removed lines

@@ -44,9 +44,9 @@ 
 	 *			the object and method name as string
 	 *  @param array The array of arguments to the function call chain
 	 */
-	public function addCall($method,$args)
+	public function addCall($method, $args)
 	{
-		$this->add(array($method,$args));
+		$this->add(array($method, $args));
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	{
 		$args=func_get_args();
 		if($this->getCount()===0)
-			return isset($args[0])?$args[0]:null;
+			return isset($args[0]) ? $args[0] : null;
 
 		if(!$this->_iterator)
 		{
@@ -103,15 +103,15 @@ 
 			do {
 				$handler=$this->_iterator->current();
 				$this->_iterator->next();
-				if(is_array($handler[0])&&$handler[0][0] instanceof IClassBehavior)
-					array_splice($handler[1],1,count($args),$args);
+				if(is_array($handler[0]) && $handler[0][0] instanceof IClassBehavior)
+					array_splice($handler[1], 1, count($args), $args);
 				else
-					array_splice($handler[1],0,count($args),$args);
+					array_splice($handler[1], 0, count($args), $args);
 				$handler[1][]=$this;
-				$result=call_user_func_array($handler[0],$handler[1]);
+				$result=call_user_func_array($handler[0], $handler[1]);
 			} while($this->_iterator->valid());
 		else
-			$result = $args[0];
+			$result=$args[0];
 		return $result;
 	}
 
@@ -137,10 +137,10 @@ 
 	 * @param string method name of the unspecified object method
 	 * @param array arguments to the unspecified object method
 	 */
-	public function __dycall($method,$args)
+	public function __dycall($method, $args)
 	{
 		if($this->_method==$method)
-			return call_user_func_array(array($this,'call'),$args);
+			return call_user_func_array(array($this, 'call'), $args);
 		return null;
 	}
 }
\ No newline at end of file

framework/Util/TBehavior.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	{
 		$this->_owner=$owner;
 		foreach($this->events() as $event=>$handler)
-			$owner->attachEventHandler($event,array($this,$handler));
+			$owner->attachEventHandler($event, array($this, $handler));
 	}
 
 	/**
@@ -56,7 +56,7 @@ 
 	public function detach($owner)
 	{
 		foreach($this->events() as $event=>$handler)
-			$owner->detachEventHandler($event,array($this,$handler));
+			$owner->detachEventHandler($event, array($this, $handler));
 		$this->_owner=null;
 	}
 

framework/Util/TParameterModule.php

Spacing +12 added lines, -12 removed lines

@@ -61,7 +61,7 @@ 
 		$this->loadParameters($config);
 		if($this->_paramFile!==null)
 		{
-			$configFile = null;
+			$configFile=null;
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_XML && ($cache=$this->getApplication()->getCache())!==null)
 			{
 				$cacheKey='TParameterModule:'.$this->_paramFile;
@@ -69,14 +69,14 @@ 
 				{
 					$configFile=new TXmlDocument;
 					$configFile->loadFromFile($this->_paramFile);
-					$cache->set($cacheKey,$configFile,0,new TFileCacheDependency($this->_paramFile));
+					$cache->set($cacheKey, $configFile, 0, new TFileCacheDependency($this->_paramFile));
 				}
 			}
 			else
 			{
 				if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 				{
-					$configFile = include $this->_paramFile;
+					$configFile=include $this->_paramFile;
 				}
 				else
 				{
@@ -103,12 +103,12 @@ 
 			{
 				if(is_array($parameter) && isset($parameter['class']))
 				{
-					$properties = isset($parameter['properties'])?$parameter['properties']:array();
-					$parameters[$id]=array($parameter['class'],$properties);
+					$properties=isset($parameter['properties']) ? $parameter['properties'] : array();
+					$parameters[$id]=array($parameter['class'], $properties);
 				}
 				else
 				{
-					$parameters[$id] = $parameter;
+					$parameters[$id]=$parameter;
 				}
 			}
 		}
@@ -127,7 +127,7 @@ 
 						$parameters[$id]=$value;
 				}
 				else
-					$parameters[$id]=array($type,$properties->toArray());
+					$parameters[$id]=array($type, $properties->toArray());
 			}
 		}
 
@@ -138,11 +138,11 @@ 
 			{
 				$component=Prado::createComponent($parameter[0]);
 				foreach($parameter[1] as $name=>$value)
-					$component->setSubProperty($name,$value);
-				$appParams->add($id,$component);
+					$component->setSubProperty($name, $value);
+				$appParams->add($id, $component);
 			}
 			else
-				$appParams->add($id,$parameter);
+				$appParams->add($id, $parameter);
 		}
 	}
 
@@ -164,8 +164,8 @@ 
 	{
 		if($this->_initialized)
 			throw new TInvalidOperationException('parametermodule_parameterfile_unchangeable');
-		else if(($this->_paramFile=Prado::getPathOfNamespace($value,$this->getApplication()->getConfigurationFileExt()))===null || !is_file($this->_paramFile))
-			throw new TConfigurationException('parametermodule_parameterfile_invalid',$value);
+		else if(($this->_paramFile=Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt()))===null || !is_file($this->_paramFile))
+			throw new TConfigurationException('parametermodule_parameterfile_invalid', $value);
 	}
 }
 

Braces +6 added lines, -12 removed lines

@@ -71,14 +71,12 @@ 
 					$configFile->loadFromFile($this->_paramFile);
 					$cache->set($cacheKey,$configFile,0,new TFileCacheDependency($this->_paramFile));
 				}
-			}
-			else
+			} else
 			{
 				if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 				{
 					$configFile = include $this->_paramFile;
-				}
-				else
+				} else
 				{
 					$configFile=new TXmlDocument;
 					$configFile->loadFromFile($this->_paramFile);
@@ -105,14 +103,12 @@ 
 				{
 					$properties = isset($parameter['properties'])?$parameter['properties']:array();
 					$parameters[$id]=array($parameter['class'],$properties);
-				}
-				else
+				} else
 				{
 					$parameters[$id] = $parameter;
 				}
 			}
-		}
-		else if($config instanceof TXmlElement)
+		} else if($config instanceof TXmlElement)
 		{
 			foreach($config->getElementsByTagName('parameter') as $node)
 			{
@@ -125,8 +121,7 @@ 
 						$parameters[$id]=$node;
 					else
 						$parameters[$id]=$value;
-				}
-				else
+				} else
 					$parameters[$id]=array($type,$properties->toArray());
 			}
 		}
@@ -140,8 +135,7 @@ 
 				foreach($parameter[1] as $name=>$value)
 					$component->setSubProperty($name,$value);
 				$appParams->add($id,$component);
-			}
-			else
+			} else
 				$appParams->add($id,$parameter);
 		}
 	}

framework/Util/TLogRouter.php

Spacing +103 added lines, -103 removed lines

@@ -63,7 +63,7 @@ 
  			{
 				if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 				{
-					$phpConfig = include $this->_configFile;
+					$phpConfig=include $this->_configFile;
 					$this->loadConfig($phpConfig);
 				}
 				else
@@ -74,10 +74,10 @@ 
 				}
 			}
 			else
-				throw new TConfigurationException('logrouter_configfile_invalid',$this->_configFile);
+				throw new TConfigurationException('logrouter_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
-		$this->getApplication()->attachEventHandler('OnEndRequest',array($this,'collectLogs'));
+		$this->getApplication()->attachEventHandler('OnEndRequest', array($this, 'collectLogs'));
 	}
 
 	/**
@@ -93,14 +93,14 @@ 
 			{
 				foreach($config['routes'] as $route)
 				{
-					$properties = isset($route['properties'])?$route['properties']:array();
+					$properties=isset($route['properties']) ? $route['properties'] : array();
 					if(!isset($route['class']))
 						throw new TConfigurationException('logrouter_routeclass_required');
 					$route=Prado::createComponent($route['class']);
 					if(!($route instanceof TLogRoute))
 						throw new TConfigurationException('logrouter_routetype_invalid');
 					foreach($properties as $name=>$value)
-						$route->setSubproperty($name,$value);
+						$route->setSubproperty($name, $value);
 					$this->_routes[]=$route;
 					$route->init($route);
 				}
@@ -117,7 +117,7 @@ 
 				if(!($route instanceof TLogRoute))
 					throw new TConfigurationException('logrouter_routetype_invalid');
 				foreach($properties as $name=>$value)
-					$route->setSubproperty($name,$value);
+					$route->setSubproperty($name, $value);
 				$this->_routes[]=$route;
 				$route->init($routeConfig);
 			}
@@ -153,8 +153,8 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,$this->getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('logrouter_configfile_invalid',$value);
+		if(($this->_configFile=Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt()))===null)
+			throw new TConfigurationException('logrouter_configfile_invalid', $value);
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 		{
 			$this->_levels=null;
 			$levels=strtolower($levels);
-			foreach(explode(',',$levels) as $level)
+			foreach(explode(',', $levels) as $level)
 			{
 				$level=trim($level);
 				if(isset(self::$_levelValues[$level]))
@@ -283,7 +283,7 @@ 
 		else
 		{
 			$this->_categories=null;
-			foreach(explode(',',$categories) as $category)
+			foreach(explode(',', $categories) as $category)
 			{
 				if(($category=trim($category))!=='')
 					$this->_categories[]=$category;
@@ -297,7 +297,7 @@ 
 	 */
 	protected function getLevelName($level)
 	{
-		return isset(self::$_levelNames[$level])?self::$_levelNames[$level]:'Unknown';
+		return isset(self::$_levelNames[$level]) ? self::$_levelNames[$level] : 'Unknown';
 	}
 
 	/**
@@ -306,7 +306,7 @@ 
 	 */
 	protected function getLevelValue($level)
 	{
-		return isset(self::$_levelValues[$level])?self::$_levelValues[$level]:0;
+		return isset(self::$_levelValues[$level]) ? self::$_levelValues[$level] : 0;
 	}
 
 	/**
@@ -317,9 +317,9 @@ 
 	 * @param integer timestamp
 	 * @return string formatted message
 	 */
-	protected function formatLogMessage($message,$level,$category,$time)
+	protected function formatLogMessage($message, $level, $category, $time)
 	{
-		return @date('M d H:i:s',$time).' ['.$this->getLevelName($level).'] ['.$category.'] '.$message."\n";
+		return @date('M d H:i:s', $time).' ['.$this->getLevelName($level).'] ['.$category.'] '.$message."\n";
 	}
 
 	/**
@@ -328,7 +328,7 @@ 
 	 */
 	public function collectLogs(TLogger $logger)
 	{
-		$logs=$logger->getLogs($this->getLevels(),$this->getCategories());
+		$logs=$logger->getLogs($this->getLevels(), $this->getCategories());
 		if(!empty($logs))
 			$this->processLogs($logs);
 	}
@@ -399,7 +399,7 @@ 
 	public function setLogPath($value)
 	{
 		if(($this->_logPath=Prado::getPathOfNamespace($value))===null || !is_dir($this->_logPath) || !is_writable($this->_logPath))
-			throw new TConfigurationException('filelogroute_logpath_invalid',$value);
+			throw new TConfigurationException('filelogroute_logpath_invalid', $value);
 	}
 
 	/**
@@ -433,7 +433,7 @@ 
 	public function setMaxFileSize($value)
 	{
 		$this->_maxFileSize=TPropertyValue::ensureInteger($value);
-		if($this->_maxFileSize<=0)
+		if($this->_maxFileSize <= 0)
 			throw new TInvalidDataValueException('filelogroute_maxfilesize_invalid');
 	}
 
@@ -451,7 +451,7 @@ 
 	public function setMaxLogFiles($value)
 	{
 		$this->_maxLogFiles=TPropertyValue::ensureInteger($value);
-		if($this->_maxLogFiles<1)
+		if($this->_maxLogFiles < 1)
 			throw new TInvalidDataValueException('filelogroute_maxlogfiles_invalid');
 	}
 
@@ -462,10 +462,10 @@ 
 	protected function processLogs($logs)
 	{
 		$logFile=$this->getLogPath().DIRECTORY_SEPARATOR.$this->getLogFile();
-		if(@filesize($logFile)>$this->_maxFileSize*1024)
+		if(@filesize($logFile) > $this->_maxFileSize * 1024)
 			$this->rotateFiles();
 		foreach($logs as $log)
-			error_log($this->formatLogMessage($log[0],$log[1],$log[2],$log[3]),3,$logFile);
+			error_log($this->formatLogMessage($log[0], $log[1], $log[2], $log[3]), 3, $logFile);
 	}
 
 	/**
@@ -474,7 +474,7 @@ 
 	protected function rotateFiles()
 	{
 		$file=$this->getLogPath().DIRECTORY_SEPARATOR.$this->getLogFile();
-		for($i=$this->_maxLogFiles;$i>0;--$i)
+		for($i=$this->_maxLogFiles; $i > 0; --$i)
 		{
 			$rotateFile=$file.'.'.$i;
 			if(is_file($rotateFile))
@@ -482,11 +482,11 @@ 
 				if($i===$this->_maxLogFiles)
 					unlink($rotateFile);
 				else
-					rename($rotateFile,$file.'.'.($i+1));
+					rename($rotateFile, $file.'.'.($i + 1));
 			}
 		}
 		if(is_file($file))
-			rename($file,$file.'.1');
+			rename($file, $file.'.1');
 	}
 }
 
@@ -547,11 +547,11 @@ 
 	{
 		$message='';
 		foreach($logs as $log)
-			$message.=$this->formatLogMessage($log[0],$log[1],$log[2],$log[3]);
-		$message=wordwrap($message,70);
-		$returnPath = ini_get('sendmail_path') ? "Return-Path:{$this->_from}\r\n" : '';
+			$message.=$this->formatLogMessage($log[0], $log[1], $log[2], $log[3]);
+		$message=wordwrap($message, 70);
+		$returnPath=ini_get('sendmail_path') ? "Return-Path:{$this->_from}\r\n" : '';
 		foreach($this->_emails as $email)
-			mail($email,$this->getSubject(),$message,"From:{$this->_from}\r\n{$returnPath}");
+			mail($email, $this->getSubject(), $message, "From:{$this->_from}\r\n{$returnPath}");
 
 	}
 
@@ -574,10 +574,10 @@ 
 		else
 		{
 			$this->_emails=array();
-			foreach(explode(',',$emails) as $email)
+			foreach(explode(',', $emails) as $email)
 			{
 				$email=trim($email);
-				if(preg_match(self::EMAIL_PATTERN,$email))
+				if(preg_match(self::EMAIL_PATTERN, $email))
 					$this->_emails[]=$email;
 			}
 		}
@@ -637,24 +637,24 @@ 
 	public function processLogs($logs)
 	{
 		if(empty($logs) || $this->getApplication()->getMode()==='Performance') return;
-		$first = $logs[0][3];
-		$even = true;
-		$response = $this->getApplication()->getResponse();
+		$first=$logs[0][3];
+		$even=true;
+		$response=$this->getApplication()->getResponse();
 		$response->write($this->renderHeader());
-		for($i=0,$n=count($logs);$i<$n;++$i)
+		for($i=0, $n=count($logs); $i < $n; ++$i)
 		{
-			if ($i<$n-1)
+			if($i < $n - 1)
 			{
-				$timing['delta'] = $logs[$i+1][3] - $logs[$i][3];
-				$timing['total'] = $logs[$i+1][3] - $first;
+				$timing['delta']=$logs[$i + 1][3] - $logs[$i][3];
+				$timing['total']=$logs[$i + 1][3] - $first;
 			}
 			else
 			{
-				$timing['delta'] = '?';
-				$timing['total'] = $logs[$i][3] - $first;
+				$timing['delta']='?';
+				$timing['total']=$logs[$i][3] - $first;
 			}
-			$timing['even'] = !($even = !$even);
-			$response->write($this->renderMessage($logs[$i],$timing));
+			$timing['even']=!($even=!$even);
+			$response->write($this->renderMessage($logs[$i], $timing));
 		}
 		$response->write($this->renderFooter());
 	}
@@ -664,7 +664,7 @@ 
 	 */
 	public function setCssClass($value)
 	{
-		$this->_cssClass = TPropertyValue::ensureString($value);
+		$this->_cssClass=TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -677,10 +677,10 @@ 
 
 	protected function renderHeader()
 	{
-		$string = '';
+		$string='';
 		if($className=$this->getCssClass())
 		{
-			$string = <<<EOD
+			$string=<<<EOD
 <table class="$className">
 	<tr class="header">
 		<th colspan="5">
@@ -694,7 +694,7 @@ 
 		}
 		else
 		{
-			$string = <<<EOD
+			$string=<<<EOD
 <table cellspacing="0" cellpadding="2" border="0" width="100%" style="table-layout:auto">
 	<tr>
 		<th style="background-color: black; color:white;" colspan="5">
@@ -711,16 +711,16 @@ 
 
 	protected function renderMessage($log, $info)
 	{
-		$string = '';
-		$total = sprintf('%0.6f', $info['total']);
-		$delta = sprintf('%0.6f', $info['delta']);
-		$msg = preg_replace('/\(line[^\)]+\)$/','',$log[0]); //remove line number info
-		$msg = THttpUtility::htmlEncode($msg);
+		$string='';
+		$total=sprintf('%0.6f', $info['total']);
+		$delta=sprintf('%0.6f', $info['delta']);
+		$msg=preg_replace('/\(line[^\)]+\)$/', '', $log[0]); //remove line number info
+		$msg=THttpUtility::htmlEncode($msg);
 		if($this->getCssClass())
 		{
-			$colorCssClass = $log[1];
-			$messageCssClass = $info['even'] ? 'even' : 'odd';
-			$string = <<<EOD
+			$colorCssClass=$log[1];
+			$messageCssClass=$info['even'] ? 'even' : 'odd';
+			$string=<<<EOD
 	<tr class="message level$colorCssClass $messageCssClass">
 		<td class="code">&nbsp;</td>
 		<td class="category">{$log[2]}</td>
@@ -732,9 +732,9 @@ 
 		}
 		else
 		{
-			$bgcolor = $info['even'] ? "#fff" : "#eee";
-			$color = $this->getColorLevel($log[1]);
-			$string = <<<EOD
+			$bgcolor=$info['even'] ? "#fff" : "#eee";
+			$color=$this->getColorLevel($log[1]);
+			$string=<<<EOD
 	<tr style="background-color: {$bgcolor}; color:#000">
 		<td style="border:1px solid silver;background-color: $color;">&nbsp;</td>
 		<td>{$log[2]}</td>
@@ -764,25 +764,25 @@ 
 
 	protected function renderFooter()
 	{
-		$string = '';
+		$string='';
 		if($this->getCssClass())
 		{
-			$string .= '<tr class="footer"><td colspan="5">';
+			$string.='<tr class="footer"><td colspan="5">';
 			foreach(self::$_levelValues as $name => $level)
 			{
-				$string .= '<span class="level'.$level.'">'.strtoupper($name)."</span>";
+				$string.='<span class="level'.$level.'">'.strtoupper($name)."</span>";
 			}
 		}
 		else
 		{
-			$string .= "<tr><td colspan=\"5\" style=\"text-align:center; background-color:black; border-top: 1px solid #ccc; padding:0.2em;\">";
+			$string.="<tr><td colspan=\"5\" style=\"text-align:center; background-color:black; border-top: 1px solid #ccc; padding:0.2em;\">";
 			foreach(self::$_levelValues as $name => $level)
 			{
-				$string .= "<span style=\"color:white; border:1px solid white; background-color:".$this->getColorLevel($level);
-				$string .= ";margin: 0.5em; padding:0.01em;\">".strtoupper($name)."</span>";
+				$string.="<span style=\"color:white; border:1px solid white; background-color:".$this->getColorLevel($level);
+				$string.=";margin: 0.5em; padding:0.01em;\">".strtoupper($name)."</span>";
 			}
 		}
-		$string .= '</td></tr></table>';
+		$string.='</td></tr></table>';
 		return $string;
 	}
 }
@@ -865,7 +865,7 @@ 
 			if($this->_autoCreate)
 				$this->createDbTable();
 			else
-				throw new TConfigurationException('db_logtable_inexistent',$this->_logTable);
+				throw new TConfigurationException('db_logtable_inexistent', $this->_logTable);
 		}
 
 		parent::init($config);
@@ -881,10 +881,10 @@ 
 		$command=$this->getDbConnection()->createCommand($sql);
 		foreach($logs as $log)
 		{
-			$command->bindValue(':message',$log[0]);
-			$command->bindValue(':level',$log[1]);
-			$command->bindValue(':category',$log[2]);
-			$command->bindValue(':logtime',$log[3]);
+			$command->bindValue(':message', $log[0]);
+			$command->bindValue(':level', $log[1]);
+			$command->bindValue(':category', $log[2]);
+			$command->bindValue(':logtime', $log[3]);
 			$command->execute();
 		}
 	}
@@ -895,14 +895,14 @@ 
 	 */
 	protected function createDbTable()
 	{
-		$db = $this->getDbConnection();
+		$db=$this->getDbConnection();
 		$driver=$db->getDriverName();
-		$autoidAttributes = '';
+		$autoidAttributes='';
 		if($driver==='mysql')
-			$autoidAttributes = 'AUTO_INCREMENT';
+			$autoidAttributes='AUTO_INCREMENT';
 
 		$sql='CREATE TABLE '.$this->_logTable.' (
-			log_id INTEGER NOT NULL PRIMARY KEY ' . $autoidAttributes . ',
+			log_id INTEGER NOT NULL PRIMARY KEY ' . $autoidAttributes.',
 			level INTEGER,
 			category VARCHAR(128),
 			logtime VARCHAR(20),
@@ -924,7 +924,7 @@ 
 			if($config instanceof TDataSourceConfig)
 				return $config->getDbConnection();
 			else
-				throw new TConfigurationException('dblogroute_connectionid_invalid',$this->_connID);
+				throw new TConfigurationException('dblogroute_connectionid_invalid', $this->_connID);
 		}
 		else
 		{
@@ -1020,9 +1020,9 @@ 
  */
 class TFirebugLogRoute extends TBrowserLogRoute
 {
-	protected function renderHeader ()
+	protected function renderHeader()
 	{
-		$string = <<<EOD
+		$string=<<<EOD
 
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -1035,23 +1035,23 @@ 
 		return $string;
 	}
 
-	protected function renderMessage ($log, $info)
+	protected function renderMessage($log, $info)
 	{
-		$logfunc = $this->getFirebugLoggingFunction($log[1]);
-		$total = sprintf('%0.6f', $info['total']);
-		$delta = sprintf('%0.6f', $info['delta']);
-		$msg = trim($this->formatLogMessage($log[0], $log[1], $log[2], ''));
-		$msg = preg_replace('/\(line[^\)]+\)$/', '', $msg); //remove line number info
-		$msg = "[{$total}] [{$delta}] ".$msg; // Add time spent and cumulated time spent
-		$string = $logfunc . '(\'' . addslashes($msg) . '\');' . "\n";
+		$logfunc=$this->getFirebugLoggingFunction($log[1]);
+		$total=sprintf('%0.6f', $info['total']);
+		$delta=sprintf('%0.6f', $info['delta']);
+		$msg=trim($this->formatLogMessage($log[0], $log[1], $log[2], ''));
+		$msg=preg_replace('/\(line[^\)]+\)$/', '', $msg); //remove line number info
+		$msg="[{$total}] [{$delta}] ".$msg; // Add time spent and cumulated time spent
+		$string=$logfunc.'(\''.addslashes($msg).'\');'."\n";
 
 		return $string;
 	}
 
 
-	protected function renderFooter ()
+	protected function renderFooter()
 	{
-		$string = <<<EOD
+		$string=<<<EOD
 
 }
 </script>
@@ -1063,7 +1063,7 @@ 
 
 	protected function getFirebugLoggingFunction($level)
 	{
-		switch ($level)
+		switch($level)
 		{
 			case TLogger::DEBUG:
 			case TLogger::INFO:
@@ -1099,9 +1099,9 @@ 
 	/**
 	 * Default group label
 	 */
-	const DEFAULT_LABEL = 'System.Util.TLogRouter(TFirePhpLogRoute)';
+	const DEFAULT_LABEL='System.Util.TLogRouter(TFirePhpLogRoute)';
 
-	private $_groupLabel = null;
+	private $_groupLabel=null;
 
 	public function processLogs($logs)
 	{
@@ -1111,41 +1111,41 @@ 
 		if(headers_sent()) {
 			echo '
 				<div style="width:100%; background-color:darkred; color:#FFF; padding:2px">
-					TFirePhpLogRoute.GroupLabel "<i>' . $this -> getGroupLabel() . '</i>" -
+					TFirePhpLogRoute.GroupLabel "<i>' . $this -> getGroupLabel().'</i>" -
 					Routing to FirePHP impossible, because headers already sent!
 				</div>
 			';
-			$fallback = new TBrowserLogRoute();
+			$fallback=new TBrowserLogRoute();
 			$fallback->processLogs($logs);
 			return;
 		}
 
-		require_once Prado::getPathOfNamespace('System.3rdParty.FirePHPCore') . '/FirePHP.class.php';
-		$firephp = FirePHP::getInstance(true);
+		require_once Prado::getPathOfNamespace('System.3rdParty.FirePHPCore').'/FirePHP.class.php';
+		$firephp=FirePHP::getInstance(true);
 		$firephp->setOptions(array('useNativeJsonEncode' => false));
 		$firephp->group($this->getGroupLabel(), array('Collapsed' => true));
 		$firephp->log('Time,  Message');
 
-		$first = $logs[0][3];
-		$c = count($logs);
-		for($i=0,$n=$c;$i<$n;++$i)
+		$first=$logs[0][3];
+		$c=count($logs);
+		for($i=0, $n=$c; $i < $n; ++$i)
 		{
-			$message	= $logs[$i][0];
-			$level		= $logs[$i][1];
-			$category	= $logs[$i][2];
+			$message=$logs[$i][0];
+			$level=$logs[$i][1];
+			$category=$logs[$i][2];
 
-			if ($i<$n-1)
+			if($i < $n - 1)
 			{
-				$delta = $logs[$i+1][3] - $logs[$i][3];
-				$total = $logs[$i+1][3] - $first;
+				$delta=$logs[$i + 1][3] - $logs[$i][3];
+				$total=$logs[$i + 1][3] - $first;
 			}
 			else
 			{
-				$delta = '?';
-				$total = $logs[$i][3] - $first;
+				$delta='?';
+				$total=$logs[$i][3] - $first;
 			}
 
-			$message = sPrintF('+%0.6f: %s', $delta, preg_replace('/\(line[^\)]+\)$/', '', $message));
+			$message=sPrintF('+%0.6f: %s', $delta, preg_replace('/\(line[^\)]+\)$/', '', $message));
 			$firephp->fb($message, $category, self::translateLogLevel($level));
 		}
 		$firephp->log(sPrintF('%0.6f', $total), 'Cumulated Time');

Braces +10 added lines, -20 removed lines

@@ -65,15 +65,13 @@ 
 				{
 					$phpConfig = include $this->_configFile;
 					$this->loadConfig($phpConfig);
-				}
-				else
+				} else
 				{
 					$dom=new TXmlDocument;
 					$dom->loadFromFile($this->_configFile);
 					$this->loadConfig($dom);
 				}
-			}
-			else
+			} else
 				throw new TConfigurationException('logrouter_configfile_invalid',$this->_configFile);
 		}
 		$this->loadConfig($config);
@@ -105,8 +103,7 @@ 
 					$route->init($route);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('route') as $routeConfig)
 			{
@@ -647,8 +644,7 @@ 
 			{
 				$timing['delta'] = $logs[$i+1][3] - $logs[$i][3];
 				$timing['total'] = $logs[$i+1][3] - $first;
-			}
-			else
+			} else
 			{
 				$timing['delta'] = '?';
 				$timing['total'] = $logs[$i][3] - $first;
@@ -691,8 +687,7 @@ 
 		<th>Category</th><th>Message</th><th>Time Spent (s)</th><th>Cumulated Time Spent (s)</th>
 	</tr>
 EOD;
-		}
-		else
+		} else
 		{
 			$string = <<<EOD
 <table cellspacing="0" cellpadding="2" border="0" width="100%" style="table-layout:auto">
@@ -729,8 +724,7 @@ 
 		<td class="cumulatedtime">{$total}</td>
 	</tr>
 EOD;
-		}
-		else
+		} else
 		{
 			$bgcolor = $info['even'] ? "#fff" : "#eee";
 			$color = $this->getColorLevel($log[1]);
@@ -772,8 +766,7 @@ 
 			{
 				$string .= '<span class="level'.$level.'">'.strtoupper($name)."</span>";
 			}
-		}
-		else
+		} else
 		{
 			$string .= "<tr><td colspan=\"5\" style=\"text-align:center; background-color:black; border-top: 1px solid #ccc; padding:0.2em;\">";
 			foreach(self::$_levelValues as $name => $level)
@@ -858,8 +851,7 @@ 
 		try
 		{
 			$db->createCommand($sql)->query()->close();
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			// DB table not exists
 			if($this->_autoCreate)
@@ -925,8 +917,7 @@ 
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dblogroute_connectionid_invalid',$this->_connID);
-		}
-		else
+		} else
 		{
 			$db=new TDbConnection;
 			// default to SQLite3 database
@@ -1138,8 +1129,7 @@ 
 			{
 				$delta = $logs[$i+1][3] - $logs[$i][3];
 				$total = $logs[$i+1][3] - $first;
-			}
-			else
+			} else
 			{
 				$delta = '?';
 				$total = $logs[$i][3] - $first;

framework/Data/Common/Oracle/TOracleCommandBuilder.php

Spacing +52 added lines, -52 removed lines

@@ -30,10 +30,10 @@ 
 	 * @return string SQL search condition matching on a set of columns.
 	 */
 	public function getSearchExpression($fields, $keywords) {
-		$columns = array ();
-		foreach ($fields as $field) {
-			if ($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
-				$columns[] = $field;
+		$columns=array();
+		foreach($fields as $field) {
+			if($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
+				$columns[]=$field;
 		}
 		return parent :: getSearchExpression($columns, $keywords);
 	}
@@ -42,8 +42,8 @@ 
 	 * @return boolean true if column can be used for LIKE searching.
 	 */
 	protected function isSearchableColumn($column) {
-		$type = strtolower($column->getDbType());
-		return $type === 'character varying' || $type === 'varchar2' || $type === 'character' || $type === 'char' || $type === 'text';
+		$type=strtolower($column->getDbType());
+		return $type==='character varying' || $type==='varchar2' || $type==='character' || $type==='char' || $type==='text';
 	}
 
 	/**
@@ -72,59 +72,59 @@ 
 	 * @param integer row offset, -1 to ignore offset.
 	 * @return string SQL with limit and offset in Oracle way.
 	 */
-	public function applyLimitOffset($sql, $limit = -1, $offset = -1) {
-		if ((int) $limit <= 0 && (int) $offset <= 0)
+	public function applyLimitOffset($sql, $limit=-1, $offset=-1) {
+		if((int) $limit <= 0 && (int) $offset <= 0)
 			return $sql;
 
-		$pradoNUMLIN = 'pradoNUMLIN';
-		$fieldsALIAS = 'xyz';
+		$pradoNUMLIN='pradoNUMLIN';
+		$fieldsALIAS='xyz';
 
-		$nfimDaSQL = strlen($sql);
-		$nfimDoWhere = (strpos($sql, 'ORDER') !== false ? strpos($sql, 'ORDER') : $nfimDaSQL);
-		$niniDoSelect = strpos($sql, 'SELECT') + 6;
-		$nfimDoSelect = (strpos($sql, 'FROM') !== false ? strpos($sql, 'FROM') : $nfimDaSQL);
+		$nfimDaSQL=strlen($sql);
+		$nfimDoWhere=(strpos($sql, 'ORDER')!==false ? strpos($sql, 'ORDER') : $nfimDaSQL);
+		$niniDoSelect=strpos($sql, 'SELECT') + 6;
+		$nfimDoSelect=(strpos($sql, 'FROM')!==false ? strpos($sql, 'FROM') : $nfimDaSQL);
 
 		$WhereInSubSelect="";
 		if(strpos($sql, 'WHERE')!==false)
-			$WhereInSubSelect = "WHERE " .substr($sql, strpos($sql, 'WHERE')+5, $nfimDoWhere - $niniDoWhere);
+			$WhereInSubSelect="WHERE ".substr($sql, strpos($sql, 'WHERE') + 5, $nfimDoWhere - $niniDoWhere);
 
-		$sORDERBY = '';
-		if (stripos($sql, 'ORDER') !== false) {
-			$p = stripos($sql, 'ORDER');
-			$sORDERBY = substr($sql, $p +8);
+		$sORDERBY='';
+		if(stripos($sql, 'ORDER')!==false) {
+			$p=stripos($sql, 'ORDER');
+			$sORDERBY=substr($sql, $p + 8);
 		}
 
-		$fields = substr($sql, 0, $nfimDoSelect);
-		$fields = trim(substr($fields, $niniDoSelect));
-		$aliasedFields = ', ';
+		$fields=substr($sql, 0, $nfimDoSelect);
+		$fields=trim(substr($fields, $niniDoSelect));
+		$aliasedFields=', ';
 
-		if (trim($fields) == '*') {
-			$aliasedFields = ", {$fieldsALIAS}.{$fields}";
-			$fields = '';
-			$arr = $this->getTableInfo()->getColumns();
-			foreach ($arr as $field) {
-				$fields .= strtolower($field->getColumnName()) . ', ';
+		if(trim($fields)=='*') {
+			$aliasedFields=", {$fieldsALIAS}.{$fields}";
+			$fields='';
+			$arr=$this->getTableInfo()->getColumns();
+			foreach($arr as $field) {
+				$fields.=strtolower($field->getColumnName()).', ';
 			}
-			$fields = str_replace('"', '', $fields);
-			$fields = trim($fields);
-			$fields = substr($fields, 0, strlen($fields) - 1);
+			$fields=str_replace('"', '', $fields);
+			$fields=trim($fields);
+			$fields=substr($fields, 0, strlen($fields) - 1);
 		} else {
-			if (strpos($fields, ',') !== false) {
-				$arr = $this->getTableInfo()->getColumns();
-				foreach ($arr as $field) {
-					$field = strtolower($field);
-					$existAS = str_ireplace(' as ', '-as-', $field);
-					if (strpos($existAS, '-as-') === false)
-						$aliasedFields .= "{$fieldsALIAS}." . trim($field) . ", ";
+			if(strpos($fields, ',')!==false) {
+				$arr=$this->getTableInfo()->getColumns();
+				foreach($arr as $field) {
+					$field=strtolower($field);
+					$existAS=str_ireplace(' as ', '-as-', $field);
+					if(strpos($existAS, '-as-')===false)
+						$aliasedFields.="{$fieldsALIAS}.".trim($field).", ";
 					else
-						$aliasedFields .= "{$field}, ";
+						$aliasedFields.="{$field}, ";
 				}
-				$aliasedFields = trim($aliasedFields);
-				$aliasedFields = substr($aliasedFields, 0, strlen($aliasedFields) - 1);
+				$aliasedFields=trim($aliasedFields);
+				$aliasedFields=substr($aliasedFields, 0, strlen($aliasedFields) - 1);
 			}
 		}
-		if ($aliasedFields == ', ')
-			$aliasedFields = " , $fieldsALIAS.* ";
+		if($aliasedFields==', ')
+			$aliasedFields=" , $fieldsALIAS.* ";
 
 		/* ************************
 		$newSql = " SELECT $fields FROM ".
@@ -134,17 +134,17 @@ 
 				  ") WHERE {$pradoNUMLIN} >= {$offset} ";
 
 		************************* */
-		$offset=(int)$offset;
-		$toReg = $offset + $limit ;
-		$fullTableName = $this->getTableInfo()->getTableFullName();
-		if (empty ($sORDERBY))
+		$offset=(int) $offset;
+		$toReg=$offset + $limit;
+		$fullTableName=$this->getTableInfo()->getTableFullName();
+		if(empty ($sORDERBY))
 			$sORDERBY="ROWNUM";
 
-		$newSql = 	" SELECT $fields FROM " .
-					"(					" .
-					"		SELECT ROW_NUMBER() OVER ( ORDER BY {$sORDERBY} ) -1 as {$pradoNUMLIN} {$aliasedFields} " .
-					"		FROM {$fullTableName} {$fieldsALIAS} $WhereInSubSelect" .
-					") nn					" .
+		$newSql=" SELECT $fields FROM ".
+					"(					".
+					"		SELECT ROW_NUMBER() OVER ( ORDER BY {$sORDERBY} ) -1 as {$pradoNUMLIN} {$aliasedFields} ".
+					"		FROM {$fullTableName} {$fieldsALIAS} $WhereInSubSelect".
+					") nn					".
 					" WHERE nn.{$pradoNUMLIN} >= {$offset} AND nn.{$pradoNUMLIN} < {$toReg} ";
 		//echo $newSql."\n<br>\n";
 		return $newSql;

framework/Data/Common/Oracle/TOracleTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 class TOracleTableColumn extends TDbTableColumn
 {
 	private static $types=array(
-		'numeric' => array( 'numeric' )
+		'numeric' => array('numeric')
 //		'integer' => array('bit', 'bit varying', 'real', 'serial', 'int', 'integer'),
 //		'boolean' => array('boolean'),
 //		'float' => array('bigint', 'bigserial', 'double precision', 'money', 'numeric')
@@ -36,7 +36,7 @@ 
 	 */
 	public function getPHPType()
 	{
-		$dbtype = strtolower($this->getDbType());
+		$dbtype=strtolower($this->getDbType());
 		foreach(self::$types as $type => $dbtypes)
 		{
 			if(in_array($dbtype, $dbtypes))