pradosoft / prado

framework/Web/UI/TForm.php

Spacing +11 added lines, -11 removed lines

@@ -43,12 +43,12 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$writer->addAttribute('method',$this->getMethod());
+		$writer->addAttribute('id', $this->getClientID());
+		$writer->addAttribute('method', $this->getMethod());
 		$uri=$this->getRequest()->getRequestURI();
-		$writer->addAttribute('action',str_replace('&','&',str_replace('&','&',$uri)));
+		$writer->addAttribute('action', str_replace('&', '&', str_replace('&', '&', $uri)));
 		if(($enctype=$this->getEnctype())!=='')
-			$writer->addAttribute('enctype',$enctype);
+			$writer->addAttribute('enctype', $enctype);
 
 		$attributes=$this->getAttributes();
 		$attributes->remove('action');
@@ -59,7 +59,7 @@ 
 			if(($button=$this->findControl($butt))!==null)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 			else
-				throw new TInvalidDataValueException('form_defaultbutton_invalid',$butt);
+				throw new TInvalidDataValueException('form_defaultbutton_invalid', $butt);
 		}
 	}
 
@@ -108,7 +108,7 @@ 
 	 */
 	public function getDefaultButton()
 	{
-		return $this->getViewState('DefaultButton','');
+		return $this->getViewState('DefaultButton', '');
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function setDefaultButton($value)
 	{
-		$this->setViewState('DefaultButton',$value,'');
+		$this->setViewState('DefaultButton', $value, '');
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	public function getMethod()
 	{
-		return $this->getViewState('Method','post');
+		return $this->getViewState('Method', 'post');
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function setMethod($value)
 	{
-		$this->setViewState('Method',TPropertyValue::ensureEnum($value,'post','get'),'post');
+		$this->setViewState('Method', TPropertyValue::ensureEnum($value, 'post', 'get'), 'post');
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function getEnctype()
 	{
-		return $this->getViewState('Enctype','');
+		return $this->getViewState('Enctype', '');
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public function setEnctype($value)
 	{
-		$this->setViewState('Enctype',$value,'');
+		$this->setViewState('Enctype', $value, '');
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -92,8 +92,7 @@
 
 			$cs->renderScriptFilesEnd($writer);
 			$cs->renderEndScripts($writer);
-		}
-		else
+		} else
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 

framework/Web/UI/THtmlWriter.php

Spacing +5 added lines, -5 removed lines

@@ -88,7 +88,7 @@ 
 
 	public function setWriter($writer)
 	{
-		$this->_writer = $writer;
+		$this->_writer=$writer;
 	}
 	/**
 	 * Adds a list of attributes to be rendered.
@@ -105,7 +105,7 @@ 
 	 * @param string name of the attribute
 	 * @param string value of the attribute
 	 */
-	public function addAttribute($name,$value)
+	public function addAttribute($name, $value)
 	{
 		$this->_attributes[THttpUtility::htmlStrip($name)]=THttpUtility::htmlEncode($value);
 	}
@@ -134,7 +134,7 @@ 
 	 * @param string stylesheet attribute name
 	 * @param string stylesheet attribute value
 	 */
-	public function addStyleAttribute($name,$value)
+	public function addStyleAttribute($name, $value)
 	{
 		$this->_styles[THttpUtility::htmlStrip($name)]=THttpUtility::htmlEncode($value);
 	}
@@ -203,12 +203,12 @@ 
 		if(isset(self::$_simpleTags[$tagName]))
 		{
 			$str.=' />';
-			$this->_openTags[] = '';
+			$this->_openTags[]='';
 		}
 		else
 		{
 			$str.='>';
-			$this->_openTags[] = $tagName;
+			$this->_openTags[]=$tagName;
 		}
 		$this->_writer->write($str);
 		$this->_attributes=array();

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
 		{
 			$str.=' />';
 			$this->_openTags[] = '';
-		}
-		else
+		} else
 		{
 			$str.='>';
 			$this->_openTags[] = $tagName;

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/Util/TDateTimeStamp.php

Spacing +34 added lines, -34 removed lines

@@ -25,8 +25,8 @@ 
  */
 class TDateTimeStamp
 {
-	protected static $_month_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	protected static $_month_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	protected static $_month_normal=array("", 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+	protected static $_month_leaf=array("", 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
 	/**
 	 * Returns the day of the week (0=Sunday, 1=Monday, .. 6=Saturday)
@@ -36,7 +36,7 @@ 
 	 */
 	public function getDayofWeek($year, $month, $day)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setDate($year, $month, $day);
 		return (int) $dt->format('w');
 	}
@@ -49,8 +49,8 @@ 
 	 */
 	public function isLeapYear($year)
 	{
-		$year = $this->digitCheck($year);
-		$dt = new DateTime();
+		$year=$this->digitCheck($year);
+		$dt=new DateTime();
 		$dt->setDate($year, 1, 1);
 		return (bool) $dt->format('L');
 	}
@@ -62,22 +62,22 @@ 
 	 */
 	protected function digitCheck($y)
 	{
-		if ($y < 100){
-			$yr = (integer) date("Y");
-			$century = (integer) ($yr /100);
+		if($y < 100) {
+			$yr=(integer) date("Y");
+			$century=(integer) ($yr / 100);
 
-			if ($yr%100 > 50) {
-				$c1 = $century + 1;
-				$c0 = $century;
+			if($yr % 100 > 50) {
+				$c1=$century + 1;
+				$c0=$century;
 			} else {
-				$c1 = $century;
-				$c0 = $century - 1;
+				$c1=$century;
+				$c0=$century - 1;
 			}
-			$c1 *= 100;
+			$c1*=100;
 			// if 2-digit year is less than 30 years in future, set it to this century
 			// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-			if (($y + $c1) < $yr+30) $y = $y + $c1;
-			else $y = $y + $c0*100;
+			if(($y + $c1) < $yr + 30) $y=$y + $c1;
+			else $y=$y + $c0 * 100;
 		}
 		return $y;
 	}
@@ -92,7 +92,7 @@ 
 	 */
 	public function getGMTDiff($ts=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($ts)
 			$dt->setTimeStamp($ts);
 		else
@@ -106,9 +106,9 @@ 
 	 */
 	function parseDate($txt=false)
 	{
-		if ($txt === false) return getdate();
+		if($txt===false) return getdate();
 
-		$dt = new DateTime($txt);
+		$dt=new DateTime($txt);
 
 		return array(
 			'seconds' => (int) $dt->format('s'),
@@ -128,11 +128,11 @@ 
 	/**
 	 * @return array an array with date info.
 	 */
-	function getDate($d=false,$fast=false)
+	function getDate($d=false, $fast=false)
 	{
-		if ($d === false) return getdate();
+		if($d===false) return getdate();
 
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setTimestamp($d);
 
 		return array(
@@ -153,20 +153,20 @@ 
 	/**
 	 * @return boolean true if valid date, semantic check only.
 	 */
-	public function isValidDate($y,$m,$d)
+	public function isValidDate($y, $m, $d)
 	{
-		if ($this->isLeapYear($y))
-			$marr =& self::$_month_leaf;
+		if($this->isLeapYear($y))
+			$marr=& self::$_month_leaf;
 		else
-			$marr =& self::$_month_normal;
+			$marr=& self::$_month_normal;
 
-		if ($m > 12 || $m < 1) return false;
+		if($m > 12 || $m < 1) return false;
 
-		if ($d > 31 || $d < 1) return false;
+		if($d > 31 || $d < 1) return false;
 
-		if ($marr[$m] < $d) return false;
+		if($marr[$m] < $d) return false;
 
-		if ($y < 1000 && $y > 3000) return false;
+		if($y < 1000 && $y > 3000) return false;
 
 		return true;
 	}
@@ -174,9 +174,9 @@ 
 	/**
 	 * @return string formatted date based on timestamp $d
 	 */
-	function formatDate($fmt,$ts=false,$is_gmt=false)
+	function formatDate($fmt, $ts=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setTimestamp($ts);
@@ -187,9 +187,9 @@ 
 	/**
 	 * @return integer|float a timestamp given a local time
      */
-	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
+	function getTimeStamp($hr, $min, $sec, $mon=false, $day=false, $year=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setDate($year!==false ? $year : date('Y'),

Indentation +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
 
 	/**
 	 * @return integer|float a timestamp given a local time
-     */
+	 */
 	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
 	{
 		$dt = new DateTime();

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/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;