pradosoft / prado

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);
 	}
 }
 

framework/Util/TVarDumper.php

Spacing +17 added lines, -17 removed lines

@@ -40,27 +40,27 @@ 
 	 * @param integer maximum depth that the dumper should go into the variable. Defaults to 10.
 	 * @return string the string representation of the variable
 	 */
-	public static function dump($var,$depth=10,$highlight=false)
+	public static function dump($var, $depth=10, $highlight=false)
 	{
 		self::$_output='';
 		self::$_objects=array();
 		self::$_depth=$depth;
-		self::dumpInternal($var,0);
+		self::dumpInternal($var, 0);
 		if($highlight)
 		{
-			$result=highlight_string("<?php\n".self::$_output,true);
-			return preg_replace('/&lt;\\?php<br \\/>/','',$result,1);
+			$result=highlight_string("<?php\n".self::$_output, true);
+			return preg_replace('/&lt;\\?php<br \\/>/', '', $result, 1);
 		}
 		else
 			return self::$_output;
 	}
 
-	private static function dumpInternal($var,$level)
+	private static function dumpInternal($var, $level)
 	{
 		switch(gettype($var))
 		{
 			case 'boolean':
-				self::$_output.=$var?'true':'false';
+				self::$_output.=$var ? 'true' : 'false';
 				break;
 			case 'integer':
 				self::$_output.="$var";
@@ -81,41 +81,41 @@ 
 				self::$_output.='{unknown}';
 				break;
 			case 'array':
-				if(self::$_depth<=$level)
+				if(self::$_depth <= $level)
 					self::$_output.='array(...)';
 				else if(empty($var))
 					self::$_output.='array()';
 				else
 				{
 					$keys=array_keys($var);
-					$spaces=str_repeat(' ',$level*4);
+					$spaces=str_repeat(' ', $level * 4);
 					self::$_output.="array\n".$spaces.'(';
 					foreach($keys as $key)
 					{
 						self::$_output.="\n".$spaces."    [$key] => ";
-						self::$_output.=self::dumpInternal($var[$key],$level+1);
+						self::$_output.=self::dumpInternal($var[$key], $level + 1);
 					}
 					self::$_output.="\n".$spaces.')';
 				}
 				break;
 			case 'object':
-				if(($id=array_search($var,self::$_objects,true))!==false)
-					self::$_output.=get_class($var).'#'.($id+1).'(...)';
-				else if(self::$_depth<=$level)
+				if(($id=array_search($var, self::$_objects, true))!==false)
+					self::$_output.=get_class($var).'#'.($id + 1).'(...)';
+				else if(self::$_depth <= $level)
 					self::$_output.=get_class($var).'(...)';
 				else
 				{
-					$id=array_push(self::$_objects,$var);
+					$id=array_push(self::$_objects, $var);
 					$className=get_class($var);
-					$members=(array)$var;
+					$members=(array) $var;
 					$keys=array_keys($members);
-					$spaces=str_repeat(' ',$level*4);
+					$spaces=str_repeat(' ', $level * 4);
 					self::$_output.="$className#$id\n".$spaces.'(';
 					foreach($keys as $key)
 					{
-						$keyDisplay=strtr(trim($key),array("\0"=>':'));
+						$keyDisplay=strtr(trim($key), array("\0"=>':'));
 						self::$_output.="\n".$spaces."    [$keyDisplay] => ";
-						self::$_output.=self::dumpInternal($members[$key],$level+1);
+						self::$_output.=self::dumpInternal($members[$key], $level + 1);
 					}
 					self::$_output.="\n".$spaces.')';
 				}

framework/IO/TTarFileExtractor.php

Spacing +155 added lines, -155 removed lines

@@ -60,14 +60,14 @@ 
     */
     public function __construct($p_tarname)
     {
-        $this->_tarname = $p_tarname;
+        $this->_tarname=$p_tarname;
     }
 
     public function __destruct()
     {
         $this->_close();
         // ----- Look for a local copy to delete
-        if ($this->_temp_tarname != '')
+        if($this->_temp_tarname!='')
             @unlink($this->_temp_tarname);
     }
 
@@ -110,11 +110,11 @@ 
     */
     protected function extractModify($p_path, $p_remove_path)
     {
-        $v_result = true;
-        $v_list_detail = array();
+        $v_result=true;
+        $v_list_detail=array();
 
-        if ($v_result = $this->_openRead()) {
-            $v_result = $this->_extractList($p_path, $v_list_detail,
+        if($v_result=$this->_openRead()) {
+            $v_result=$this->_extractList($p_path, $v_list_detail,
 			                                "complete", 0, $p_remove_path);
             $this->_close();
         }
@@ -129,8 +129,8 @@ 
 
     private function _isArchive($p_filename=null)
     {
-        if ($p_filename == null) {
-            $p_filename = $this->_tarname;
+        if($p_filename==null) {
+            $p_filename=$this->_tarname;
         }
         clearstatcache();
         return @is_file($p_filename);
@@ -138,39 +138,39 @@ 
 
     private function _openRead()
     {
-        if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
+        if(strtolower(substr($this->_tarname, 0, 7))=='http://') {
 
           // ----- Look if a local copy need to be done
-          if ($this->_temp_tarname == '') {
-              $this->_temp_tarname = uniqid('tar').'.tmp';
-              if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
+          if($this->_temp_tarname=='') {
+              $this->_temp_tarname=uniqid('tar').'.tmp';
+              if(!$v_file_from=@fopen($this->_tarname, 'rb')) {
                 $this->_error('Unable to open in read mode \''
 				              .$this->_tarname.'\'');
-                $this->_temp_tarname = '';
+                $this->_temp_tarname='';
                 return false;
               }
-              if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
+              if(!$v_file_to=@fopen($this->_temp_tarname, 'wb')) {
                 $this->_error('Unable to open in write mode \''
 				              .$this->_temp_tarname.'\'');
-                $this->_temp_tarname = '';
+                $this->_temp_tarname='';
                 return false;
               }
-              while ($v_data = @fread($v_file_from, 1024))
+              while($v_data=@fread($v_file_from, 1024))
                   @fwrite($v_file_to, $v_data);
               @fclose($v_file_from);
               @fclose($v_file_to);
           }
 
           // ----- File to open if the local copy
-          $v_filename = $this->_temp_tarname;
+          $v_filename=$this->_temp_tarname;
 
         } else
           // ----- File to open if the normal Tar file
-          $v_filename = $this->_tarname;
+          $v_filename=$this->_tarname;
 
-		$this->_file = @fopen($v_filename, "rb");
+		$this->_file=@fopen($v_filename, "rb");
 
-        if ($this->_file == 0) {
+        if($this->_file==0) {
             $this->_error('Unable to open in read mode \''.$v_filename.'\'');
             return false;
         }
@@ -181,17 +181,17 @@ 
     private function _close()
     {
         //if (isset($this->_file)) {
-        if (is_resource($this->_file))
+        if(is_resource($this->_file))
 		{
                @fclose($this->_file);
-            $this->_file = 0;
+            $this->_file=0;
         }
 
         // ----- Look if a local copy need to be erase
         // Note that it might be interesting to keep the url for a time : ToDo
-        if ($this->_temp_tarname != '') {
+        if($this->_temp_tarname!='') {
             @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
+            $this->_temp_tarname='';
         }
 
         return true;
@@ -202,76 +202,76 @@ 
         $this->_close();
 
         // ----- Look for a local copy
-        if ($this->_temp_tarname != '') {
+        if($this->_temp_tarname!='') {
             // ----- Remove the local copy but not the remote tarname
             @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
+            $this->_temp_tarname='';
         } else {
             // ----- Remove the local tarname file
             @unlink($this->_tarname);
         }
-        $this->_tarname = '';
+        $this->_tarname='';
 
         return true;
     }
 
     private function _readBlock()
     {
-      $v_block = null;
-      if (is_resource($this->_file)) {
-              $v_block = @fread($this->_file, 512);
+      $v_block=null;
+      if(is_resource($this->_file)) {
+              $v_block=@fread($this->_file, 512);
       }
       return $v_block;
     }
 
     private function _jumpBlock($p_len=null)
     {
-      if (is_resource($this->_file)) {
-          if ($p_len === null)
-              $p_len = 1;
+      if(is_resource($this->_file)) {
+          if($p_len===null)
+              $p_len=1;
 
-              @fseek($this->_file, @ftell($this->_file)+($p_len*512));
+              @fseek($this->_file, @ftell($this->_file) + ($p_len * 512));
       }
       return true;
     }
 
     private function _readHeader($v_binary_data, &$v_header)
     {
-        if (strlen($v_binary_data)==0) {
-            $v_header['filename'] = '';
+        if(strlen($v_binary_data)==0) {
+            $v_header['filename']='';
             return true;
         }
 
-        if (strlen($v_binary_data) != 512) {
-            $v_header['filename'] = '';
+        if(strlen($v_binary_data)!=512) {
+            $v_header['filename']='';
             $this->_error('Invalid block size : '.strlen($v_binary_data));
             return false;
         }
 
         // ----- Calculate the checksum
-        $v_checksum = 0;
+        $v_checksum=0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for($i=0; $i < 148; $i++)
+            $v_checksum+=ord(substr($v_binary_data, $i, 1));
         // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
+        for($i=148; $i < 156; $i++)
+            $v_checksum+=ord(' ');
         // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for($i=156; $i < 512; $i++)
+           $v_checksum+=ord(substr($v_binary_data, $i, 1));
 
-        $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
+        $v_data=unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
 		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
 						 ."a32uname/a32gname/a8devmajor/a8devminor",
 						 $v_binary_data);
 
         // ----- Extract the checksum
-        $v_header['checksum'] = OctDec(trim($v_data['checksum']));
-        if ($v_header['checksum'] != $v_checksum) {
-            $v_header['filename'] = '';
+        $v_header['checksum']=OctDec(trim($v_data['checksum']));
+        if($v_header['checksum']!=$v_checksum) {
+            $v_header['filename']='';
 
             // ----- Look for last block (empty block)
-            if (($v_checksum == 256) && ($v_header['checksum'] == 0))
+            if(($v_checksum==256) && ($v_header['checksum']==0))
                 return true;
 
             $this->_error('Invalid checksum for file "'.$v_data['filename']
@@ -281,38 +281,38 @@ 
         }
 
         // ----- Extract the properties
-        $v_header['filename'] = trim($v_data['filename']);
-        $v_header['mode'] = OctDec(trim($v_data['mode']));
-        $v_header['uid'] = OctDec(trim($v_data['uid']));
-        $v_header['gid'] = OctDec(trim($v_data['gid']));
-        $v_header['size'] = OctDec(trim($v_data['size']));
-        $v_header['mtime'] = OctDec(trim($v_data['mtime']));
-        if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
-          $v_header['size'] = 0;
+        $v_header['filename']=trim($v_data['filename']);
+        $v_header['mode']=OctDec(trim($v_data['mode']));
+        $v_header['uid']=OctDec(trim($v_data['uid']));
+        $v_header['gid']=OctDec(trim($v_data['gid']));
+        $v_header['size']=OctDec(trim($v_data['size']));
+        $v_header['mtime']=OctDec(trim($v_data['mtime']));
+        if(($v_header['typeflag']=$v_data['typeflag'])=="5") {
+          $v_header['size']=0;
         }
         return true;
     }
 
     private function _readLongHeader(&$v_header)
     {
-      $v_filename = '';
-      $n = floor($v_header['size']/512);
-      for ($i=0; $i<$n; $i++) {
-        $v_content = $this->_readBlock();
-        $v_filename .= $v_content;
+      $v_filename='';
+      $n=floor($v_header['size'] / 512);
+      for($i=0; $i < $n; $i++) {
+        $v_content=$this->_readBlock();
+        $v_filename.=$v_content;
       }
-      if (($v_header['size'] % 512) != 0) {
-        $v_content = $this->_readBlock();
-        $v_filename .= $v_content;
+      if(($v_header['size'] % 512)!=0) {
+        $v_content=$this->_readBlock();
+        $v_filename.=$v_content;
       }
 
       // ----- Read the next header
-      $v_binary_data = $this->_readBlock();
+      $v_binary_data=$this->_readBlock();
 
-      if (!$this->_readHeader($v_binary_data, $v_header))
+      if(!$this->_readHeader($v_binary_data, $v_header))
         return false;
 
-      $v_header['filename'] = $v_filename;
+      $v_header['filename']=$v_filename;
 
       return true;
     }
@@ -321,34 +321,34 @@ 
 	                      $p_file_list, $p_remove_path)
     {
     $v_result=true;
-    $v_nb = 0;
-    $v_extract_all = true;
-    $v_listing = false;
-
-    $p_path = $this->_translateWinPath($p_path, false);
-    if ($p_path == '' || (substr($p_path, 0, 1) != '/'
-	    && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-      $p_path = "./".$p_path;
+    $v_nb=0;
+    $v_extract_all=true;
+    $v_listing=false;
+
+    $p_path=$this->_translateWinPath($p_path, false);
+    if($p_path=='' || (substr($p_path, 0, 1)!='/'
+	    && substr($p_path, 0, 3)!="../" && !strpos($p_path, ':'))) {
+      $p_path="./".$p_path;
     }
-    $p_remove_path = $this->_translateWinPath($p_remove_path);
+    $p_remove_path=$this->_translateWinPath($p_remove_path);
 
     // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
-      $p_remove_path .= '/';
-    $p_remove_path_size = strlen($p_remove_path);
+    if(($p_remove_path!='') && (substr($p_remove_path, -1)!='/'))
+      $p_remove_path.='/';
+    $p_remove_path_size=strlen($p_remove_path);
 
-    switch ($p_mode) {
+    switch($p_mode) {
       case "complete" :
-        $v_extract_all = true;
-        $v_listing = false;
+        $v_extract_all=true;
+        $v_listing=false;
       break;
       case "partial" :
-          $v_extract_all = false;
-          $v_listing = false;
+          $v_extract_all=false;
+          $v_listing=false;
       break;
       case "list" :
-          $v_extract_all = false;
-          $v_listing = true;
+          $v_extract_all=false;
+          $v_listing=true;
       break;
       default :
         $this->_error('Invalid extract mode ('.$p_mode.')');
@@ -357,103 +357,103 @@ 
 
     clearstatcache();
 
-    while (strlen($v_binary_data = $this->_readBlock()) != 0)
+    while(strlen($v_binary_data=$this->_readBlock())!=0)
     {
-      $v_extract_file = false;
-      $v_extraction_stopped = 0;
+      $v_extract_file=false;
+      $v_extraction_stopped=0;
 
-      if (!$this->_readHeader($v_binary_data, $v_header))
+      if(!$this->_readHeader($v_binary_data, $v_header))
         return false;
 
-      if ($v_header['filename'] == '') {
+      if($v_header['filename']=='') {
         continue;
       }
 
       // ----- Look for long filename
-      if ($v_header['typeflag'] == 'L') {
-        if (!$this->_readLongHeader($v_header))
+      if($v_header['typeflag']=='L') {
+        if(!$this->_readLongHeader($v_header))
           return false;
       }
 
-      if ((!$v_extract_all) && (is_array($p_file_list))) {
+      if((!$v_extract_all) && (is_array($p_file_list))) {
         // ----- By default no unzip if the file is not found
-        $v_extract_file = false;
+        $v_extract_file=false;
 
-        for ($i=0; $i<sizeof($p_file_list); $i++) {
+        for($i=0; $i < sizeof($p_file_list); $i++) {
           // ----- Look if it is a directory
-          if (substr($p_file_list[$i], -1) == '/') {
+          if(substr($p_file_list[$i], -1)=='/') {
             // ----- Look if the directory is in the filename path
-            if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
+            if((strlen($v_header['filename']) > strlen($p_file_list[$i]))
 			    && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
 				    == $p_file_list[$i])) {
-              $v_extract_file = true;
+              $v_extract_file=true;
               break;
             }
           }
 
           // ----- It is a file, so compare the file names
-          elseif ($p_file_list[$i] == $v_header['filename']) {
-            $v_extract_file = true;
+          elseif($p_file_list[$i]==$v_header['filename']) {
+            $v_extract_file=true;
             break;
           }
         }
       } else {
-        $v_extract_file = true;
+        $v_extract_file=true;
       }
 
       // ----- Look if this file need to be extracted
-      if (($v_extract_file) && (!$v_listing))
+      if(($v_extract_file) && (!$v_listing))
       {
-        if (($p_remove_path != '')
+        if(($p_remove_path!='')
             && (substr($v_header['filename'], 0, $p_remove_path_size)
 			    == $p_remove_path))
-          $v_header['filename'] = substr($v_header['filename'],
+          $v_header['filename']=substr($v_header['filename'],
 		                                 $p_remove_path_size);
-        if (($p_path != './') && ($p_path != '/')) {
-          while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
+        if(($p_path!='./') && ($p_path!='/')) {
+          while(substr($p_path, -1)=='/')
+            $p_path=substr($p_path, 0, strlen($p_path) - 1);
 
-          if (substr($v_header['filename'], 0, 1) == '/')
-              $v_header['filename'] = $p_path.$v_header['filename'];
+          if(substr($v_header['filename'], 0, 1)=='/')
+              $v_header['filename']=$p_path.$v_header['filename'];
           else
-            $v_header['filename'] = $p_path.'/'.$v_header['filename'];
+            $v_header['filename']=$p_path.'/'.$v_header['filename'];
         }
-        if (file_exists($v_header['filename'])) {
-          if (   (@is_dir($v_header['filename']))
-		      && ($v_header['typeflag'] == '')) {
+        if(file_exists($v_header['filename'])) {
+          if((@is_dir($v_header['filename']))
+		      && ($v_header['typeflag']=='')) {
             $this->_error('File '.$v_header['filename']
 			              .' already exists as a directory');
             return false;
           }
-          if (   ($this->_isArchive($v_header['filename']))
-		      && ($v_header['typeflag'] == "5")) {
+          if(($this->_isArchive($v_header['filename']))
+		      && ($v_header['typeflag']=="5")) {
             $this->_error('Directory '.$v_header['filename']
 			              .' already exists as a file');
             return false;
           }
-          if (!is_writeable($v_header['filename'])) {
+          if(!is_writeable($v_header['filename'])) {
             $this->_error('File '.$v_header['filename']
 			              .' already exists and is write protected');
             return false;
           }
-          if (filemtime($v_header['filename']) > $v_header['mtime']) {
+          if(filemtime($v_header['filename']) > $v_header['mtime']) {
             // To be completed : An error or silent no replace ?
           }
         }
 
         // ----- Check the directory availability and create it if necessary
-        elseif (($v_result
-		         = $this->_dirCheck(($v_header['typeflag'] == "5"
-				                    ?$v_header['filename']
-									:dirname($v_header['filename'])))) != 1) {
+        elseif(($v_result
+		         = $this->_dirCheck(($v_header['typeflag']=="5"
+				                    ? $v_header['filename']
+									:dirname($v_header['filename']))))!=1) {
             $this->_error('Unable to create path for '.$v_header['filename']);
             return false;
         }
 
-        if ($v_extract_file) {
-          if ($v_header['typeflag'] == "5") {
-            if (!@file_exists($v_header['filename'])) {
-                if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
+        if($v_extract_file) {
+          if($v_header['typeflag']=="5") {
+            if(!@file_exists($v_header['filename'])) {
+                if(!@mkdir($v_header['filename'], PRADO_CHMOD)) {
                     $this->_error('Unable to create directory {'
 					              .$v_header['filename'].'}');
                     return false;
@@ -461,18 +461,18 @@ 
                 chmod($v_header['filename'], PRADO_CHMOD);
             }
           } else {
-              if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
+              if(($v_dest_file=@fopen($v_header['filename'], "wb"))==0) {
                   $this->_error('Error while opening {'.$v_header['filename']
 				                .'} in write binary mode');
                   return false;
               } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
-                      $v_content = $this->_readBlock();
+                  $n=floor($v_header['size'] / 512);
+                  for($i=0; $i < $n; $i++) {
+                      $v_content=$this->_readBlock();
                       fwrite($v_dest_file, $v_content, 512);
                   }
-            if (($v_header['size'] % 512) != 0) {
-              $v_content = $this->_readBlock();
+            if(($v_header['size'] % 512)!=0) {
+              $v_content=$this->_readBlock();
               fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
             }
 
@@ -486,7 +486,7 @@ 
 
           // ----- Check the file size
           clearstatcache();
-          if (filesize($v_header['filename']) != $v_header['size']) {
+          if(filesize($v_header['filename'])!=$v_header['size']) {
               $this->_error('Extracted file '.$v_header['filename']
 			                .' does not have the correct file size \''
 							.filesize($v_header['filename'])
@@ -496,10 +496,10 @@ 
           }
           }
         } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
+          $this->_jumpBlock(ceil(($v_header['size'] / 512)));
         }
       } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
+          $this->_jumpBlock(ceil(($v_header['size'] / 512)));
       }
 
       /* TBC : Seems to be unused ...
@@ -509,15 +509,15 @@ 
         $v_end_of_file = @feof($this->_file);
         */
 
-      if ($v_listing || $v_extract_file || $v_extraction_stopped) {
+      if($v_listing || $v_extract_file || $v_extraction_stopped) {
         // ----- Log extracted files
-        if (($v_file_dir = dirname($v_header['filename']))
+        if(($v_file_dir=dirname($v_header['filename']))
 		    == $v_header['filename'])
-          $v_file_dir = '';
-        if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
-          $v_file_dir = '/';
+          $v_file_dir='';
+        if((substr($v_header['filename'], 0, 1)=='/') && ($v_file_dir==''))
+          $v_file_dir='/';
 
-        $p_list_detail[$v_nb++] = $v_header;
+        $p_list_detail[$v_nb++]=$v_header;
       }
     }
 
@@ -534,36 +534,36 @@ 
      */
     protected function _dirCheck($p_dir)
     {
-        if ((@is_dir($p_dir)) || ($p_dir == ''))
+        if((@is_dir($p_dir)) || ($p_dir==''))
             return true;
 
-        $p_parent_dir = dirname($p_dir);
+        $p_parent_dir=dirname($p_dir);
 
-        if (($p_parent_dir != $p_dir) &&
-            ($p_parent_dir != '') &&
+        if(($p_parent_dir!=$p_dir) &&
+            ($p_parent_dir!='') &&
             (!$this->_dirCheck($p_parent_dir)))
              return false;
 
-        if (!@mkdir($p_dir, PRADO_CHMOD)) {
+        if(!@mkdir($p_dir, PRADO_CHMOD)) {
             $this->_error("Unable to create directory '$p_dir'");
             return false;
         }
-        chmod($p_dir,PRADO_CHMOD);
+        chmod($p_dir, PRADO_CHMOD);
 
         return true;
     }
 
     protected function _translateWinPath($p_path, $p_remove_disk_letter=true)
     {
-      if (substr(PHP_OS, 0, 3) == 'WIN') {
+      if(substr(PHP_OS, 0, 3)=='WIN') {
           // ----- Look for potential disk letter
-          if (   ($p_remove_disk_letter)
-		      && (($v_position = strpos($p_path, ':')) != false)) {
-              $p_path = substr($p_path, $v_position+1);
+          if(($p_remove_disk_letter)
+		      && (($v_position=strpos($p_path, ':'))!=false)) {
+              $p_path=substr($p_path, $v_position + 1);
           }
           // ----- Change potential windows directory separator
-          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-              $p_path = strtr($p_path, '\\', '/');
+          if((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1)=='\\')) {
+              $p_path=strtr($p_path, '\\', '/');
           }
       }
       return $p_path;

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))

framework/Data/Common/Oracle/TOracleMetaData.php

Spacing +60 added lines, -60 removed lines

@@ -25,7 +25,7 @@ 
  */
 class TOracleMetaData extends TDbMetaData
 {
-	private $_defaultSchema = 'system';
+	private $_defaultSchema='system';
 
 
 	/**
@@ -58,10 +58,10 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts= explode('.', str_replace('"','',$table))) > 1)
+		if(count($parts=explode('.', str_replace('"', '', $table))) > 1)
 			return array($parts[0], $parts[1]);
 		else
-			return array($this->getDefaultSchema(),$parts[0]);
+			return array($this->getDefaultSchema(), $parts[0]);
 	}
 
 	/**
@@ -71,12 +71,12 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($schemaName,$tableName) = $this->getSchemaTableName($table);
+		list($schemaName, $tableName)=$this->getSchemaTableName($table);
 
 		// This query is made much more complex by the addition of the 'attisserial' field.
 		// The subquery to get that field checks to see if there is an internally dependent
 		// sequence on the field.
-		$sql =
+		$sql=
 <<<EOD
 		SELECT
 			a.COLUMN_ID,
@@ -96,14 +96,14 @@ 
 EOD;
 		$this->getDbConnection()->setActive(true);
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':table', $tableName);
 		//$command->bindValue(':schema', $schemaName);
-		$tableInfo = $this->createNewTableInfo($schemaName, $tableName);
+		$tableInfo=$this->createNewTableInfo($schemaName, $tableName);
 		$index=0;
 		foreach($command->query() as $col)
 		{
-			$col['index'] = $index++;
+			$col['index']=$index++;
 			$this->processColumn($tableInfo, $col);
 		}
 		if($index===0)
@@ -116,15 +116,15 @@ 
 	 * @param string table name.
 	 * @return TOracleTableInfo
 	 */
-	protected function createNewTableInfo($schemaName,$tableName)
+	protected function createNewTableInfo($schemaName, $tableName)
 	{
-		$info['SchemaName'] = $this->assertIdentifier($schemaName);
-		$info['TableName']	= $this->assertIdentifier($tableName);
-		$info['IsView'] 	= false;
-		if($this->getIsView($schemaName,$tableName)) $info['IsView'] = true;
-		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
-		$class = $this->getTableInfoClass();
-		return new $class($info,$primary,$foreign);
+		$info['SchemaName']=$this->assertIdentifier($schemaName);
+		$info['TableName']=$this->assertIdentifier($tableName);
+		$info['IsView']=false;
+		if($this->getIsView($schemaName, $tableName)) $info['IsView']=true;
+		list($primary, $foreign)=$this->getConstraintKeys($schemaName, $tableName);
+		$class=$this->getTableInfoClass();
+		return new $class($info, $primary, $foreign);
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	{
 		if(strpos($name, '"')!==false)
 		{
-			$ref = 'http://www.oracle.com';
+			$ref='http://www.oracle.com';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
 		}
 		return $name;
@@ -147,10 +147,10 @@ 
 	 * @param string table name.
 	 * @return boolean true if the table is a view.
 	 */
-	protected function getIsView($schemaName,$tableName)
+	protected function getIsView($schemaName, $tableName)
 	{
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
-		$sql =
+		$sql=
 <<<EOD
 		select	OBJECT_TYPE
 		from 	ALL_OBJECTS
@@ -158,10 +158,10 @@ 
 		and 	OWNER = '{$schemaName}'
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':schema',$schemaName);
 		//$command->bindValue(':table', $tableName);
-		return intval($command->queryScalar() === 'VIEW');
+		return intval($command->queryScalar()==='VIEW');
 	}
 
 	/**
@@ -170,17 +170,17 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = strtolower($col['attname']); //use column name as column Id
+		$columnId=strtolower($col['attname']); //use column name as column Id
 
 		//$info['ColumnName'] 	= '"'.$columnId.'"'; //quote the column names!
-		$info['ColumnName'] 	= $columnId; //NOT quote the column names!
-		$info['ColumnId'] 		= $columnId;
-		$info['ColumnIndex'] 	= $col['index'];
-		if(! (bool)$col['attnotnull'] ) $info['AllowNull'] = true;
-		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey'] = true;
-		if( (int)$col['atttypmod'] > 0 ) $info['ColumnSize'] =  $col['atttypmod']; // - 4;
-		if( (bool)$col['atthasdef'] ) $info['DefaultValue'] = $col['adsrc'];
+		$info['ColumnName']=$columnId; //NOT quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=$col['index'];
+		if(!(bool) $col['attnotnull']) $info['AllowNull']=true;
+		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey']=true;
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey']=true;
+		if((int) $col['atttypmod'] > 0) $info['ColumnSize']=$col['atttypmod']; // - 4;
+		if((bool) $col['atthasdef']) $info['DefaultValue']=$col['adsrc'];
 		//
 		// For a while Oracle Tables has no  associated AutoIncrement Triggers
 		//
@@ -194,31 +194,31 @@ 
 			}
 		}
 		*/
-		$matches = array();
+		$matches=array();
 		if(preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
 		{
-			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/','',$col['type']);
+			$info['DbType']=preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
 			if($this->isPrecisionType($info['DbType']))
 			{
-				$info['NumericPrecision'] = intval($matches[1]);
+				$info['NumericPrecision']=intval($matches[1]);
 				if(count($matches) > 2)
-					$info['NumericScale'] = intval($matches[2]);
+					$info['NumericScale']=intval($matches[2]);
 			}
 			else
-				$info['ColumnSize'] = intval($matches[1]);
+				$info['ColumnSize']=intval($matches[1]);
 		}
 		else
-			$info['DbType'] = $col['type'];
-		$tableInfo->Columns[$columnId] = new TOracleTableColumn($info);
+			$info['DbType']=$col['type'];
+		$tableInfo->Columns[$columnId]=new TOracleTableColumn($info);
 	}
 
 	/**
 	 * @return string serial name if found, null otherwise.
 	 */
-	protected function getSequenceName($tableInfo,$src)
+	protected function getSequenceName($tableInfo, $src)
 	{
-		$matches = array();
-		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i',$src,$matches))
+		$matches=array();
+		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches))
 		{
 			if(is_int(strpos($matches[1], '.')))
 				return $matches[1];
@@ -232,7 +232,7 @@ 
 	 */
 	protected function isPrecisionType($type)
 	{
-		$type = strtolower(trim($type));
+		$type=strtolower(trim($type));
 		return $type==='number'; // || $type==='interval' || strpos($type, 'time')===0;
 	}
 
@@ -246,7 +246,7 @@ 
 	{
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
 //		select decode( a.CONSTRAINT_TYPE, 'P', 'PRIMARY KEY (', 'FOREIGN KEY (' )||b.COLUMN_NAME||')' as consrc,
-		$sql =
+		$sql=
 <<<EOD
 		select b.COLUMN_NAME as consrc,
 			   a.CONSTRAINT_TYPE as contype
@@ -257,24 +257,24 @@ 
 		and   a.CONSTRAINT_TYPE in ('P','R')
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':table', $tableName);
 		//$command->bindValue(':schema', $schemaName);
-		$primary = array();
-		$foreign = array();
+		$primary=array();
+		$foreign=array();
 		foreach($command->query() as $row)
 		{
-			switch( strtolower( $row['contype'] ) )
+			switch(strtolower($row['contype']))
 			{
 				case 'p':
-					$primary = array_merge( $primary, array(strtolower( $row['consrc'] )) );
+					$primary=array_merge($primary, array(strtolower($row['consrc'])));
 					/*
 					$arr = $this->getPrimaryKeys($row['consrc']);
 					$primary = array_merge( $primary, array(strtolower( $arr[0] )) );
 					*/
 					break;
 				case 'r':
-					$foreign = array_merge( $foreign, array(strtolower( $row['consrc'] )) );
+					$foreign=array_merge($foreign, array(strtolower($row['consrc'])));
 					/*
 					// if(($fkey = $this->getForeignKeys($row['consrc']))!==null)
 					$fkey = $this->getForeignKeys( $row['consrc'] );
@@ -283,7 +283,7 @@ 
 					break;
 			}
 		}
-		return array($primary,$foreign);
+		return array($primary, $foreign);
 	}
 
 	/**
@@ -293,9 +293,9 @@ 
 	 */
 	protected function getPrimaryKeys($src)
 	{
-		$matches = array();
+		$matches=array();
 		if(preg_match('/PRIMARY\s+KEY\s+\(([^\)]+)\)/i', $src, $matches))
-			return preg_split('/,\s+/',$matches[1]);
+			return preg_split('/,\s+/', $matches[1]);
 		return array();
 	}
 
@@ -306,16 +306,16 @@ 
 	 */
 	protected function getForeignKeys($src)
 	{
-		$matches = array();
-		$brackets = '\(([^\)]+)\)';
-		$find = "/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
+		$matches=array();
+		$brackets='\(([^\)]+)\)';
+		$find="/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
 		if(preg_match($find, $src, $matches))
 		{
-			$keys = preg_split('/,\s+/', $matches[1]);
-			$fkeys = array();
+			$keys=preg_split('/,\s+/', $matches[1]);
+			$fkeys=array();
 			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
-				$fkeys[$keys[$i]] = $fkey;
-			return array('table' => str_replace('"','',$matches[2]), 'keys' => $fkeys);
+				$fkeys[$keys[$i]]=$fkey;
+			return array('table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys);
 		}
 	}
 
@@ -328,7 +328,7 @@ 
 	{
 		foreach($tableInfo->getForeignKeys() as $fk)
 		{
-			if( $fk==$columnId )
+			if($fk==$columnId)
 			//if(in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
@@ -357,7 +357,7 @@ 
 WHERE object_type = 'TABLE' AND owner=:schema
 EOD;
 			$command=$this->getDbConnection()->createCommand($sql);
-			$command->bindParam(':schema',$schema);
+			$command->bindParam(':schema', $schema);
 		}
 
 		$rows=$command->queryAll();

framework/Data/Common/Pgsql/TPgsqlMetaData.php

Spacing +66 added lines, -66 removed lines

@@ -24,7 +24,7 @@ 
  */
 class TPgsqlMetaData extends TDbMetaData
 {
-	private $_defaultSchema = 'public';
+	private $_defaultSchema='public';
 
 	/**
 	 * @return string TDbTableInfo class name.
@@ -86,10 +86,10 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts= explode('.', str_replace('"','',$table))) > 1)
+		if(count($parts=explode('.', str_replace('"', '', $table))) > 1)
 			return array($parts[0], $parts[1]);
 		else
-			return array($this->getDefaultSchema(),$parts[0]);
+			return array($this->getDefaultSchema(), $parts[0]);
 	}
 
 	/**
@@ -99,12 +99,12 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($schemaName,$tableName) = $this->getSchemaTableName($table);
+		list($schemaName, $tableName)=$this->getSchemaTableName($table);
 
 		// This query is made much more complex by the addition of the 'attisserial' field.
 		// The subquery to get that field checks to see if there is an internally dependent
 		// sequence on the field.
-		$sql =
+		$sql=
 <<<EOD
 		SELECT
 			a.attname,
@@ -135,14 +135,14 @@ 
 		ORDER BY a.attnum
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		$command->bindValue(':schema', $schemaName);
-		$tableInfo = $this->createNewTableInfo($schemaName, $tableName);
+		$tableInfo=$this->createNewTableInfo($schemaName, $tableName);
 		$index=0;
 		foreach($command->query() as $col)
 		{
-			$col['index'] = $index++;
+			$col['index']=$index++;
 			$this->processColumn($tableInfo, $col);
 		}
 		if($index===0)
@@ -155,15 +155,15 @@ 
 	 * @param string table name.
 	 * @return TPgsqlTableInfo
 	 */
-	protected function createNewTableInfo($schemaName,$tableName)
+	protected function createNewTableInfo($schemaName, $tableName)
 	{
-		$info['SchemaName'] = $this->assertIdentifier($schemaName);
-		$info['TableName'] = $this->assertIdentifier($tableName);
-		if($this->getIsView($schemaName,$tableName))
-			$info['IsView'] = true;
-		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
-		$class = $this->getTableInfoClass();
-		return new $class($info,$primary,$foreign);
+		$info['SchemaName']=$this->assertIdentifier($schemaName);
+		$info['TableName']=$this->assertIdentifier($tableName);
+		if($this->getIsView($schemaName, $tableName))
+			$info['IsView']=true;
+		list($primary, $foreign)=$this->getConstraintKeys($schemaName, $tableName);
+		$class=$this->getTableInfoClass();
+		return new $class($info, $primary, $foreign);
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	{
 		if(strpos($name, '"')!==false)
 		{
-			$ref = 'http://www.postgresql.org/docs/7.4/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS';
+			$ref='http://www.postgresql.org/docs/7.4/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
 		}
 		return $name;
@@ -186,19 +186,19 @@ 
 	 * @param string table name.
 	 * @return boolean true if the table is a view.
 	 */
-	protected function getIsView($schemaName,$tableName)
+	protected function getIsView($schemaName, $tableName)
 	{
-		$sql =
+		$sql=
 <<<EOD
 		SELECT count(c.relname) FROM pg_catalog.pg_class c
 		LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)
 		WHERE (n.nspname=:schema) AND (c.relkind = 'v'::"char") AND c.relname = :table
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
-		$command->bindValue(':schema',$schemaName);
+		$command=$this->getDbConnection()->createCommand($sql);
+		$command->bindValue(':schema', $schemaName);
 		$command->bindValue(':table', $tableName);
-		return intval($command->queryScalar()) === 1;
+		return intval($command->queryScalar())===1;
 	}
 
 	/**
@@ -207,56 +207,56 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = $col['attname']; //use column name as column Id
+		$columnId=$col['attname']; //use column name as column Id
 
-		$info['ColumnName'] = '"'.$columnId.'"'; //quote the column names!
-		$info['ColumnId'] = $columnId;
-		$info['ColumnIndex'] = $col['index'];
+		$info['ColumnName']='"'.$columnId.'"'; //quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=$col['index'];
 		if(!$col['attnotnull'])
-			$info['AllowNull'] = true;
+			$info['AllowNull']=true;
 		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
+			$info['IsPrimaryKey']=true;
 		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+			$info['IsForeignKey']=true;
 
 		if($col['atttypmod'] > 0)
-			$info['ColumnSize'] =  $col['atttypmod'] - 4;
+			$info['ColumnSize']=$col['atttypmod'] - 4;
 		if($col['atthasdef'])
-			$info['DefaultValue'] = $col['adsrc'];
-		if($col['attisserial'] || substr($col['adsrc'],0,8) === 'nextval(')
+			$info['DefaultValue']=$col['adsrc'];
+		if($col['attisserial'] || substr($col['adsrc'], 0, 8)==='nextval(')
 		{
-			if(($sequence = $this->getSequenceName($tableInfo, $col['adsrc']))!==null)
+			if(($sequence=$this->getSequenceName($tableInfo, $col['adsrc']))!==null)
 			{
-				$info['SequenceName'] = $sequence;
+				$info['SequenceName']=$sequence;
 				unset($info['DefaultValue']);
 			}
 		}
-		$matches = array();
+		$matches=array();
 		if(preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
 		{
-			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/','',$col['type']);
+			$info['DbType']=preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
 			if($this->isPrecisionType($info['DbType']))
 			{
-				$info['NumericPrecision'] = intval($matches[1]);
+				$info['NumericPrecision']=intval($matches[1]);
 				if(count($matches) > 2)
-					$info['NumericScale'] = intval($matches[2]);
+					$info['NumericScale']=intval($matches[2]);
 			}
 			else
-				$info['ColumnSize'] = intval($matches[1]);
+				$info['ColumnSize']=intval($matches[1]);
 		}
 		else
-			$info['DbType'] = $col['type'];
+			$info['DbType']=$col['type'];
 
-		$tableInfo->Columns[$columnId] = new TPgsqlTableColumn($info);
+		$tableInfo->Columns[$columnId]=new TPgsqlTableColumn($info);
 	}
 
 	/**
 	 * @return string serial name if found, null otherwise.
 	 */
-	protected function getSequenceName($tableInfo,$src)
+	protected function getSequenceName($tableInfo, $src)
 	{
-		$matches = array();
-		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i',$src,$matches))
+		$matches=array();
+		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches))
 		{
 			if(is_int(strpos($matches[1], '.')))
 				return $matches[1];
@@ -270,7 +270,7 @@ 
 	 */
 	protected function isPrecisionType($type)
 	{
-		$type = strtolower(trim($type));
+		$type=strtolower(trim($type));
 		return $type==='numeric' || $type==='interval' || strpos($type, 'time')===0;
 	}
 
@@ -282,7 +282,7 @@ 
 	 */
 	protected function getConstraintKeys($schemaName, $tableName)
 	{
-		$sql =
+		$sql=
 <<<EOD
 	SELECT conname, consrc, contype, indkey, indisclustered FROM (
 			SELECT
@@ -330,25 +330,25 @@ 
 			1
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		$command->bindValue(':schema', $schemaName);
-		$primary = array();
-		$foreign = array();
+		$primary=array();
+		$foreign=array();
 		foreach($command->query() as $row)
 		{
 			switch($row['contype'])
 			{
 				case 'p':
-					$primary = $this->getPrimaryKeys($tableName, $schemaName, $row['indkey']);
+					$primary=$this->getPrimaryKeys($tableName, $schemaName, $row['indkey']);
 					break;
 				case 'f':
-					if(($fkey = $this->getForeignKeys($row['consrc']))!==null)
-						$foreign[] = $fkey;
+					if(($fkey=$this->getForeignKeys($row['consrc']))!==null)
+						$foreign[]=$fkey;
 					break;
 			}
 		}
-		return array($primary,$foreign);
+		return array($primary, $foreign);
 	}
 
 	/**
@@ -358,8 +358,8 @@ 
 	 */
 	protected function getPrimaryKeys($tableName, $schemaName, $columnIndex)
 	{
-		$index = join(', ', explode(' ', $columnIndex));
-		$sql =
+		$index=join(', ', explode(' ', $columnIndex));
+		$sql=
 <<<EOD
 		SELECT attnum, attname FROM pg_catalog.pg_attribute WHERE
 		attrelid=(
@@ -369,14 +369,14 @@ 
 		)
 				AND attnum IN ({$index})
 EOD;
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		$command->bindValue(':schema', $schemaName);
 //		$command->bindValue(':columnIndex', join(', ', explode(' ', $columnIndex)));
-		$primary = array();
+		$primary=array();
 		foreach($command->query() as $row)
 		{
-						$primary[] = $row['attname'];
+						$primary[]=$row['attname'];
 		}
 
 		return $primary;
@@ -389,16 +389,16 @@ 
 	 */
 	protected function getForeignKeys($src)
 	{
-		$matches = array();
-		$brackets = '\(([^\)]+)\)';
-		$find = "/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
+		$matches=array();
+		$brackets='\(([^\)]+)\)';
+		$find="/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
 		if(preg_match($find, $src, $matches))
 		{
-			$keys = preg_split('/,\s+/', $matches[1]);
-			$fkeys = array();
+			$keys=preg_split('/,\s+/', $matches[1]);
+			$fkeys=array();
 			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
-				$fkeys[$keys[$i]] = $fkey;
-			return array('table' => str_replace('"','',$matches[2]), 'keys' => $fkeys);
+				$fkeys[$keys[$i]]=$fkey;
+			return array('table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys);
 		}
 	}
 
@@ -432,7 +432,7 @@ 
 WHERE table_schema=:schema AND table_type='BASE TABLE'
 EOD;
 		$command=$this->getDbConnection()->createCommand($sql);
-		$command->bindParam(':schema',$schema);
+		$command->bindParam(':schema', $schema);
 		$rows=$command->queryAll();
 		$names=array();
 		foreach($rows as $row)

framework/Data/Common/Pgsql/TPgsqlTableColumn.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 */
 	public function getPHPType()
 	{
-		$dbtype = strtolower($this->getDbType());
+		$dbtype=strtolower($this->getDbType());
 		foreach(self::$types as $type => $dbtypes)
 		{
 			if(in_array($dbtype, $dbtypes))

framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php

Spacing +6 added lines, -6 removed lines

@@ -30,11 +30,11 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		$columns = array();
+		$columns=array();
 		foreach($fields as $field)
 		{
 			if($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
-				$columns[] = $field;
+				$columns[]=$field;
 		}
 		return parent::getSearchExpression($columns, $keywords);
 	}
@@ -44,9 +44,9 @@ 
 	 */
 	protected function isSearchableColumn($column)
 	{
-		$type = strtolower($column->getDbType());
-		return $type === 'character varying' || $type === 'varchar' ||
-				$type === 'character' || $type === 'char' || $type === 'text';
+		$type=strtolower($column->getDbType());
+		return $type==='character varying' || $type==='varchar' ||
+				$type==='character' || $type==='char' || $type==='text';
 	}
 
 	/**
@@ -59,7 +59,7 @@ 
 	{
 		$conditions=array();
 		foreach($words as $word)
-			$conditions[] = $column.' ILIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
+			$conditions[]=$column.' ILIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
 		return '('.implode(' AND ', $conditions).')';
 	}