pradosoft / prado

framework/I18N/core/TCache_Lite.php

Switch Indentation +9 added lines, -9 removed lines

@@ -611,15 +611,15 @@
     function _hash($data, $controlType)
     {
         switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            $this->raiseError('Unknown controlType ! '.
-            '(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+        	case 'md5':
+            	return md5($data);
+        	case 'crc32':
+            	return sprintf('% 32d', crc32($data));
+        	case 'strlen':
+            	return sprintf('% 32d', strlen($data));
+        	default:
+            	$this->raiseError('Unknown controlType ! '.
+            	'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
         }
     }
 

Spacing +105 added lines, -105 removed lines

@@ -54,7 +54,7 @@ 
     *
     * @var string $_cacheDir
     */
-    protected $_cacheDir = '/tmp/';
+    protected $_cacheDir='/tmp/';
 
     /**
     * Enable / disable caching
@@ -63,14 +63,14 @@ 
     *
     * @var boolean $_caching
     */
-    protected $_caching = true;
+    protected $_caching=true;
 
     /**
     * Cache lifetime (in seconds)
     *
     * @var int $_lifeTime
     */
-    protected $_lifeTime = 3600;
+    protected $_lifeTime=3600;
 
     /**
     * Enable / disable fileLocking
@@ -79,7 +79,7 @@ 
     *
     * @var boolean $_fileLocking
     */
-    protected $_fileLocking = true;
+    protected $_fileLocking=true;
 
     /**
     * Timestamp of the last valid cache
@@ -105,7 +105,7 @@ 
     *
     * @var boolean $_writeControl
     */
-    protected $_writeControl = true;
+    protected $_writeControl=true;
 
     /**
     * Enable / disable read control
@@ -115,7 +115,7 @@ 
     *
     * @var boolean $_writeControl
     */
-    protected $_readControl = true;
+    protected $_readControl=true;
 
     /**
     * Type of read control (only if read control is enabled)
@@ -128,7 +128,7 @@ 
     *
     * @var boolean $_readControlType
     */
-    protected $_readControlType = 'crc32';
+    protected $_readControlType='crc32';
 
     /**
     * Current cache id
@@ -151,7 +151,7 @@ 
     *
     * @var boolean $_memoryCaching
     */
-    protected $_memoryCaching = false;
+    protected $_memoryCaching=false;
 
     /**
     * Enable / Disable "Only Memory Caching"
@@ -159,28 +159,28 @@ 
     *
     * @var boolean $_onlyMemoryCaching
     */
-    protected $_onlyMemoryCaching = false;
+    protected $_onlyMemoryCaching=false;
 
     /**
     * Memory caching array
     *
     * @var array $_memoryCachingArray
     */
-    protected $_memoryCachingArray = array();
+    protected $_memoryCachingArray=array();
 
     /**
     * Memory caching counter
     *
     * @var int $memoryCachingCounter
     */
-    protected $_memoryCachingCounter = 0;
+    protected $_memoryCachingCounter=0;
 
     /**
     * Memory caching limit
     *
     * @var int $memoryCachingLimit
     */
-    protected $_memoryCachingLimit = 1000;
+    protected $_memoryCachingLimit=1000;
 
     /**
     * File Name protection
@@ -192,7 +192,7 @@ 
     *
     * @var boolean $fileNameProtection
     */
-    protected $_fileNameProtection = true;
+    protected $_fileNameProtection=true;
 
     /**
     * Enable / disable automatic serialization
@@ -202,7 +202,7 @@ 
     *
     * @var boolean $_serialize
     */
-    protected $_automaticSerialization = false;
+    protected $_automaticSerialization=false;
 
     // --- Public methods ---
 
@@ -228,9 +228,9 @@ 
     * @param array $options options
     * @access public
     */
-    function __construct($options = array(null))
+    function __construct($options=array(null))
     {
-        $availableOptions = array(	'automaticSerialization',
+        $availableOptions=array('automaticSerialization',
         							'fileNameProtection',
         							'memoryCaching',
         							'onlyMemoryCaching',
@@ -244,11 +244,11 @@ 
         							'readControlType');
         foreach($options as $key => $value) {
             if(in_array($key, $availableOptions)) {
-                $property = '_'.$key;
-                $this->$property = $value;
+                $property='_'.$key;
+                $this->$property=$value;
             }
         }
-        $this->_refreshTime = time() - $this->_lifeTime;
+        $this->_refreshTime=time() - $this->_lifeTime;
 	}
 
     /**
@@ -261,41 +261,41 @@ 
     * @return string data of the cache (or false if no cache available)
     * @access public
     */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
+    function get($id, $group='default', $doNotTestCacheValidity=false)
     {
-        $this->_id = $id;
-        $this->_group = $group;
-        $data = false;
-        if ($this->_caching) {
+        $this->_id=$id;
+        $this->_group=$group;
+        $data=false;
+        if($this->_caching) {
             $this->_setFileName($id, $group);
-            if ($this->_memoryCaching) {
-                if (isset($this->_memoryCachingArray[$this->_file])) {
-                    if ($this->_automaticSerialization) {
+            if($this->_memoryCaching) {
+                if(isset($this->_memoryCachingArray[$this->_file])) {
+                    if($this->_automaticSerialization) {
                         return unserialize(
                         			$this->_memoryCachingArray[$this->_file]);
                     } else {
                         return $this->_memoryCachingArray[$this->_file];
                     }
                 } else {
-                    if ($this->_onlyMemoryCaching) {
+                    if($this->_onlyMemoryCaching) {
                         return false;
                     }
                 }
             }
-            if ($doNotTestCacheValidity) {
-                if (file_exists($this->_file)) {
-                    $data = $this->_read();
+            if($doNotTestCacheValidity) {
+                if(file_exists($this->_file)) {
+                    $data=$this->_read();
                 }
             } else {
-                if (@filemtime($this->_file) > $this->_refreshTime) {
-                    $data = $this->_read();
+                if(@filemtime($this->_file) > $this->_refreshTime) {
+                    $data=$this->_read();
                 }
             }
-            if (($data) and ($this->_memoryCaching)) {
+            if(($data) and ($this->_memoryCaching)) {
                 $this->_memoryCacheAdd($this->_file, $data);
             }
-            if ($this->_automaticSerialization && is_string($data)) {
-                $data = unserialize($data);
+            if($this->_automaticSerialization && is_string($data)) {
+                $data=unserialize($data);
             }
             return $data;
         }
@@ -312,24 +312,24 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function save($data, $id = null, $group = 'default')
+    function save($data, $id=null, $group='default')
     {
-        if ($this->_caching) {
-            if ($this->_automaticSerialization) {
-                $data = serialize($data);
+        if($this->_caching) {
+            if($this->_automaticSerialization) {
+                $data=serialize($data);
             }
-            if (isset($id)) {
+            if(isset($id)) {
                 $this->_setFileName($id, $group);
             }
-            if ($this->_memoryCaching) {
+            if($this->_memoryCaching) {
                 $this->_memoryCacheAdd($this->_file, $data);
-                if ($this->_onlyMemoryCaching) {
+                if($this->_onlyMemoryCaching) {
                     return true;
                 }
             }
-            if ($this->_writeControl) {
-                if (!$this->_writeAndControl($data)) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+            if($this->_writeControl) {
+                if(!$this->_writeAndControl($data)) {
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 } else {
                     return true;
@@ -349,10 +349,10 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function remove($id, $group = 'default')
+    function remove($id, $group='default')
     {
         $this->_setFileName($id, $group);
-        if (!@unlink($this->_file)) {
+        if(!@unlink($this->_file)) {
             $this->raiseError('TCache_Lite : Unable to remove cache !', -3);
             return false;
         }
@@ -369,35 +369,35 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function clean($group = false)
+    function clean($group=false)
     {
-        if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+        if($this->_fileNameProtection) {
+            $motif=($group) ? 'cache_'.md5($group).'_' : 'cache_';
         } else {
-            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
+            $motif=($group) ? 'cache_'.$group.'_' : 'cache_';
         }
-        if ($this->_memoryCaching) {
-            while (list($key, $value) = each($this->_memoryCaching)) {
-                if (strpos($key, $motif, 0)) {
+        if($this->_memoryCaching) {
+            while(list($key, $value)=each($this->_memoryCaching)) {
+                if(strpos($key, $motif, 0)) {
                     unset($this->_memoryCaching[$key]);
-                    $this->_memoryCachingCounter =
+                    $this->_memoryCachingCounter=
                     		$this->_memoryCachingCounter - 1;
                 }
             }
-            if ($this->_onlyMemoryCaching) {
+            if($this->_onlyMemoryCaching) {
                 return true;
             }
         }
-        if (!($dh = opendir($this->_cacheDir))) {
+        if(!($dh=opendir($this->_cacheDir))) {
             $this->raiseError('TCache_Lite : Unable to open cache directory !');
             return false;
         }
-        while ($file = readdir($dh)) {
-            if (($file != '.') && ($file != '..')) {
-                $file = $this->_cacheDir . $file;
-                if (is_file($file)) {
-                    if (strpos($file, $motif, 0)) {
-                        if (!@unlink($file)) {
+        while($file=readdir($dh)) {
+            if(($file!='.') && ($file!='..')) {
+                $file=$this->_cacheDir.$file;
+                if(is_file($file)) {
+                    if(strpos($file, $motif, 0)) {
+                        if(!@unlink($file)) {
              $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
                             return false;
                         }
@@ -416,22 +416,22 @@ 
     */
     function setLifeTime($newLifeTime)
     {
-        $this->_lifeTime = $newLifeTime;
-        $this->_refreshTime = time() - $newLifeTime;
+        $this->_lifeTime=$newLifeTime;
+        $this->_refreshTime=time() - $newLifeTime;
     }
 
     /**
     *
     * @access public
     */
-    function saveMemoryCachingState($id, $group = 'default')
+    function saveMemoryCachingState($id, $group='default')
     {
-        if ($this->_caching) {
-            $array = array(
+        if($this->_caching) {
+            $array=array(
                 'counter' => $this->_memoryCachingCounter,
                 'array' => $this->_memoryCachingState
             );
-            $data = serialize($array);
+            $data=serialize($array);
             $this->save($data, $id, $group);
         }
     }
@@ -440,15 +440,15 @@ 
     *
     * @access public
     */
-    function getMemoryCachingState($id, $group = 'default',
-    								$doNotTestCacheValidity = false)
+    function getMemoryCachingState($id, $group='default',
+    								$doNotTestCacheValidity=false)
     {
-        if ($this->_caching) {
-            if ($data = $this->get($id, $group, $doNotTestCacheValidity))
+        if($this->_caching) {
+            if($data=$this->get($id, $group, $doNotTestCacheValidity))
             {
-                $array = unserialize($data);
-                $this->_memoryCachingCounter = $array['counter'];
-                $this->_memoryCachingArray = $array['array'];
+                $array=unserialize($data);
+                $this->_memoryCachingCounter=$array['counter'];
+                $this->_memoryCachingArray=$array['array'];
             }
         }
     }
@@ -488,12 +488,12 @@ 
     */
     function _memoryCacheAdd($id, $data)
     {
-        $this->_memoryCachingArray[$this->_file] = $data;
-        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, $value) = each($this->_memoryCachingArray);
+        $this->_memoryCachingArray[$this->_file]=$data;
+        if($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
+            list($key, $value)=each($this->_memoryCachingArray);
             unset($this->_memoryCachingArray[$key]);
         } else {
-            $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
+            $this->_memoryCachingCounter=$this->_memoryCachingCounter + 1;
         }
     }
 
@@ -506,11 +506,11 @@ 
     */
     function _setFileName($id, $group)
     {
-        if ($this->_fileNameProtection) {
-            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
+        if($this->_fileNameProtection) {
+            $this->_file=($this->_cacheDir.'cache_'.md5($group).'_'
             						.md5($id));
         } else {
-            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
+            $this->_file=$this->_cacheDir.'cache_'.$group.'_'.$id;
         }
     }
 
@@ -527,23 +527,23 @@ 
     */
     function _read()
     {
-        $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
-        if ($fp) {
+        $fp=@fopen($this->_file, "rb");
+        if($this->_fileLocking) @flock($fp, LOCK_SH);
+        if($fp) {
         	// because the filesize can be cached by PHP itself...
             clearstatcache();
-            $length = @filesize($this->_file);
-            if ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
+            $length=@filesize($this->_file);
+            if($this->_readControl) {
+                $hashControl=@fread($fp, 32);
+                $length=$length - 32;
             }
-            $data = @fread($fp, $length);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            $data=@fread($fp, $length);
+            if($this->_fileLocking) @flock($fp, LOCK_UN);
             @fclose($fp);
-            if ($this->_readControl) {
-                $hashData = $this->_hash($data, $this->_readControlType);
-                if ($hashData != $hashControl) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+            if($this->_readControl) {
+                $hashData=$this->_hash($data, $this->_readControlType);
+                if($hashData!=$hashControl) {
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 }
             }
@@ -562,15 +562,15 @@ 
     */
     function _write($data)
     {
-        $fp = @fopen($this->_file, "wb");
-        if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
-            if ($this->_readControl) {
+        $fp=@fopen($this->_file, "wb");
+        if($fp) {
+            if($this->_fileLocking) @flock($fp, LOCK_EX);
+            if($this->_readControl) {
                 @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
             }
-            $len = strlen($data);
+            $len=strlen($data);
             @fwrite($fp, $data, $len);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            if($this->_fileLocking) @flock($fp, LOCK_UN);
             @fclose($fp);
             return true;
         }
@@ -589,7 +589,7 @@ 
     function _writeAndControl($data)
     {
         $this->_write($data);
-        $dataRead = $this->_read($data);
+        $dataRead=$this->_read($data);
         return ($dataRead==$data);
     }
 
@@ -603,7 +603,7 @@ 
     */
     function _hash($data, $controlType)
     {
-        switch ($controlType) {
+        switch($controlType) {
         case 'md5':
             return md5($data);
         case 'crc32':

framework/Wsat/TWsatARGenerator.php

Spacing +59 added lines, -59 removed lines

@@ -33,7 +33,7 @@ 
          * unquote chars
          * @var array
          */
-        private $uqChars = array('[', ']', '"', '`', "'");
+        private $uqChars=array('[', ']', '"', '`', "'");
 
         function __construct()
         {
@@ -42,31 +42,31 @@ 
 
         public function setClasPrefix($_clas_prefix)
         {
-                $this->_clasPrefix = $_clas_prefix;
+                $this->_clasPrefix=$_clas_prefix;
         }
 
         public function setClassSufix($_clas_sufix)
         {
-                $this->_classSufix = $_clas_sufix;
+                $this->_classSufix=$_clas_sufix;
         }
 
 //-----------------------------------------------------------------------------
         // <editor-fold defaultstate="collapsed" desc="Main APIs">
         public function generate($tableName)
         {
-                $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+                $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
                 $this->_commonGenerate($tableName, $tableInfo);
         }
 
         public function generateAll()
         {
-                foreach ($this->getAllTableNames() as $tableName)
+                foreach($this->getAllTableNames() as $tableName)
                 {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-                        if (!empty($this->_relations))
+                        $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
+                        if(!empty($this->_relations))
                         {
                                 // Cancel generation of M-M relationships middle table
-                                if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+                                if(count($tableInfo->getPrimaryKeys())===2 && count($tableInfo->getColumns())===2)//M-M relationships
                                         continue;
                         }
                         $this->_commonGenerate($tableName, $tableInfo);
@@ -75,26 +75,26 @@ 
 
         public function buildRelations()
         {
-                $this->_relations = array();
-                foreach ($this->getAllTableNames() as $table_name)
+                $this->_relations=array();
+                foreach($this->getAllTableNames() as $table_name)
                 {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-                        $pks = $tableInfo->getPrimaryKeys();
-                        $fks = $tableInfo->getForeignKeys();
+                        $tableInfo=$this->_dbMetaData->getTableInfo($table_name);
+                        $pks=$tableInfo->getPrimaryKeys();
+                        $fks=$tableInfo->getForeignKeys();
 
-                        if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+                        if(count($pks)===2 && count($tableInfo->getColumns())===2)//M-M relationships
                         {
-                                $table_name_mm = $fks[0]["table"];
-                                $table_name_mm2 = $fks[1]["table"];
+                                $table_name_mm=$fks[0]["table"];
+                                $table_name_mm2=$fks[1]["table"];
 
-                                $this->_relations[$table_name_mm][] = array(
+                                $this->_relations[$table_name_mm][]=array(
                                         "prop_name" => strtolower($table_name_mm2),
                                         "rel_type" => "self::MANY_TO_MANY",
                                         "ref_class_name" => $this->_getProperClassName($table_name_mm2),
                                         "prop_ref" => $table_name
                                 );
 
-                                $this->_relations[$table_name_mm2][] = array(
+                                $this->_relations[$table_name_mm2][]=array(
                                         "prop_name" => strtolower($table_name_mm),
                                         "rel_type" => "self::MANY_TO_MANY",
                                         "ref_class_name" => $this->_getProperClassName($table_name_mm),
@@ -102,20 +102,20 @@ 
                                 );
                                 continue;
                         }
-                        foreach ($fks as $fk_data)//1-M relationships
+                        foreach($fks as $fk_data)//1-M relationships
                         {
-                                $owner_table = $fk_data["table"];
-                                $slave_table = $table_name;
-                                $fk_prop = key($fk_data["keys"]);
+                                $owner_table=$fk_data["table"];
+                                $slave_table=$table_name;
+                                $fk_prop=key($fk_data["keys"]);
 
-                                $this->_relations[$owner_table][] = array(
+                                $this->_relations[$owner_table][]=array(
                                         "prop_name" => strtolower($slave_table),
                                         "rel_type" => "self::HAS_MANY",
                                         "ref_class_name" => $this->_getProperClassName($slave_table),
                                         "prop_ref" => $fk_prop
                                 );
 
-                                $this->_relations[$slave_table][] = array(
+                                $this->_relations[$slave_table][]=array(
                                         "prop_name" => strtolower($owner_table),
                                         "rel_type" => "self::BELONGS_TO",
                                         "ref_class_name" => $this->_getProperClassName($owner_table),
@@ -131,88 +131,88 @@ 
 
         private function _commonGenerate($tableName, $tableInfo)
         {
-                if (count($tableInfo->getColumns()) === 0)
-                        throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
+                if(count($tableInfo->getColumns())===0)
+                        throw new Exception("Unable to find table or view $tableName in ".$this->_dbMetaData->getDbConnection()->getConnectionString().".");
                 else
                 {
-                        $properties = array();
-                        foreach ($tableInfo->getColumns() as $field => $metadata)
-                                $properties[] = $this->generateProperty($field, $metadata);
-                        $toString = $this->_buildSmartToString($tableInfo);
+                        $properties=array();
+                        foreach($tableInfo->getColumns() as $field => $metadata)
+                                $properties[]=$this->generateProperty($field, $metadata);
+                        $toString=$this->_buildSmartToString($tableInfo);
                 }
 
-                $clasName = $this->_getProperClassName($tableName);
-                $class = $this->generateClass($properties, $tableName, $clasName, $toString);
-                $output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
+                $clasName=$this->_getProperClassName($tableName);
+                $class=$this->generateClass($properties, $tableName, $clasName, $toString);
+                $output=$this->_opFile.DIRECTORY_SEPARATOR.$clasName.".php";
                 file_put_contents($output, $class);
         }
 
         private function _getProperClassName($tableName)
         {
-                $table_name_words = str_replace("_", " ", strtolower($tableName));
-                $final_conversion = str_replace(" ", "", ucwords($table_name_words));
-                return $this->_clasPrefix . $final_conversion . $this->_classSufix;
+                $table_name_words=str_replace("_", " ", strtolower($tableName));
+                $final_conversion=str_replace(" ", "", ucwords($table_name_words));
+                return $this->_clasPrefix.$final_conversion.$this->_classSufix;
         }
 
 //-----------------------------------------------------------------------------
 
         protected function generateProperty($field, $metadata)
         {
-                $prop = '';
-                $name = '$' . $field;
+                $prop='';
+                $name='$'.$field;
 
                 /* TODO use in version 2.0 */
                 // $type = $column->getPHPType();
 
-                $prop .= "\tpublic $name;";
+                $prop.="\tpublic $name;";
                 return $prop;
         }
 
         private function _renderRelations($tablename)
         {
-                if (!isset($this->_relations[$tablename]))
+                if(!isset($this->_relations[$tablename]))
                         return "";
 
-                $code = "\tpublic static \$RELATIONS = array (";
-                foreach ($this->_relations[$tablename] as $rel_data)
-                        $code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+                $code="\tpublic static \$RELATIONS = array (";
+                foreach($this->_relations[$tablename] as $rel_data)
+                        $code.="\n\t\t'".$rel_data["prop_name"]."' => array(".$rel_data["rel_type"].", '".$rel_data["ref_class_name"]."', '".$rel_data["prop_ref"]."'),";
 
-                $code = substr($code, 0, -1);
-                $code .= "\n\t);";
+                $code=substr($code, 0, -1);
+                $code.="\n\t);";
                 return $code;
         }
 
         private function _buildSmartToString($tableInfo)
         {
-                $code = "\tpublic function __toString() {";
-                $property = "throw new THttpException(500, 'Not implemented yet.');";
+                $code="\tpublic function __toString() {";
+                $property="throw new THttpException(500, 'Not implemented yet.');";
                 try
                 {
-                        foreach ($tableInfo->getColumns() as $column)
+                        foreach($tableInfo->getColumns() as $column)
                         {
-                                if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
-                                elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
+                                if(isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
+                                        $property=str_replace($this->uqChars, "", $column->ColumnName);
+                                elseif($column->PdoType==PDO::PARAM_STR && $column->DBType!="date")
                                 {
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
+                                        $property=str_replace($this->uqChars, "", $column->ColumnName);
                                         break;
                                 }
                         }
-                } catch (Exception $ex)
+                } catch(Exception $ex)
                 {
                         Prado::trace($ex->getMessage());
                 }
-                $code .= "\n\t\treturn \$this->$property;";
-                $code .= "\n\t}";
+                $code.="\n\t\treturn \$this->$property;";
+                $code.="\n\t}";
                 return $code;
         }
 
         protected function generateClass($properties, $tablename, $classname, $toString)
         {
-                $props = implode("\n", $properties);
-                $relations = $this->_renderRelations($tablename);
-                $date = date('Y-m-d h:i:s');
-                $env_user = getenv("username");
+                $props=implode("\n", $properties);
+                $relations=$this->_renderRelations($tablename);
+                $date=date('Y-m-d h:i:s');
+                $env_user=getenv("username");
                 return <<<EOD
 <?php
 /**

framework/Wsat/TWsatBaseGenerator.php

Spacing +17 added lines, -17 removed lines

@@ -27,31 +27,31 @@ 
 
     function __construct()
     {
-        if (!class_exists("TActiveRecordManager", false))
+        if(!class_exists("TActiveRecordManager", false))
             throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
-        $ar_manager = TActiveRecordManager::getInstance();
-        $_conn = $ar_manager->getDbConnection();
-        $_conn->Active = true;
-        $this->_dbMetaData = TDbMetaData::getInstance($_conn);
+        $ar_manager=TActiveRecordManager::getInstance();
+        $_conn=$ar_manager->getDbConnection();
+        $_conn->Active=true;
+        $this->_dbMetaData=TDbMetaData::getInstance($_conn);
     }
 
     public function setOpFile($op_file_namespace)
     {
-        $op_file = Prado::getPathOfNamespace($op_file_namespace);
-        if (empty($op_file))
+        $op_file=Prado::getPathOfNamespace($op_file_namespace);
+        if(empty($op_file))
             throw new Exception("You need to fix your output folder namespace.");
-        if (!is_dir($op_file))
+        if(!is_dir($op_file))
             mkdir($op_file, 0777, true);
-        $this->_opFile = $op_file;
+        $this->_opFile=$op_file;
     }
 
     public function renderAllTablesInformation()
     {
-        foreach ($this->getAllTableNames() as $table_name)
+        foreach($this->getAllTableNames() as $table_name)
         {
-            echo $table_name . "<br>";
-            $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-            echo "Table info:" . "<br>";
+            echo $table_name."<br>";
+            $tableInfo=$this->_dbMetaData->getTableInfo($table_name);
+            echo "Table info:"."<br>";
             echo "<pre>";
             print_r($tableInfo);
             echo "</pre>";
@@ -60,9 +60,9 @@ 
 
     public function getAllTableNames()
     {
-        $tableNames = $this->_dbMetaData->findTableNames();
-        $index = array_search('pradocache', $tableNames);
-        if ($index)
+        $tableNames=$this->_dbMetaData->findTableNames();
+        $index=array_search('pradocache', $tableNames);
+        if($index)
             array_splice($tableNames, $index, 1);
         return $tableNames;
     }
@@ -76,7 +76,7 @@ 
 
     protected function eq($data)
     {
-        return '"' . $data . '"';
+        return '"'.$data.'"';
     }
 
 }

framework/Wsat/TWsatScaffoldingGenerator.php

Spacing +35 added lines, -35 removed lines

@@ -17,9 +17,9 @@ 
     /**
      * Const View Types for generation
      */
-    const LIST_TYPE = 0;
-    const ADD_TYPE = 1;
-    const SHOW_TYPE = 2;
+    const LIST_TYPE=0;
+    const ADD_TYPE=1;
+    const SHOW_TYPE=2;
 
     /**
      * Bootstrap option
@@ -46,34 +46,34 @@ 
     // <editor-fold defaultstate="collapsed" desc="Page Generation">
     public function generate($tableName, $viewType)
     {
-        switch ($viewType)
+        switch($viewType)
         {
             default:
             case self::LIST_TYPE:
-                $unitName = "list" . ucfirst($tableName);
+                $unitName="list".ucfirst($tableName);
                 break;
 
             case self::ADD_TYPE:
-                $unitName = "add" . ucfirst($tableName);
+                $unitName="add".ucfirst($tableName);
                 break;
 
             case self::SHOW_TYPE:
-                $unitName = "show" . ucfirst($tableName);
+                $unitName="show".ucfirst($tableName);
                 break;
         }
 
-        $class = $this->generateClass($unitName);
-        $outputClass = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".php";
+        $class=$this->generateClass($unitName);
+        $outputClass=$this->_opFile.DIRECTORY_SEPARATOR.$unitName.".php";
         file_put_contents($outputClass, $class);
 
-        $outputPage = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".page";
-        $page = $this->generatePage($tableName, $viewType);
+        $outputPage=$this->_opFile.DIRECTORY_SEPARATOR.$unitName.".page";
+        $page=$this->generatePage($tableName, $viewType);
         file_put_contents($outputPage, $page);
     }
 
-    private function generatePage($tableName, $type, $tContentId = "Content")
+    private function generatePage($tableName, $type, $tContentId="Content")
     {
-        $pageContent = $this->getPageContent($tableName, $type);
+        $pageContent=$this->getPageContent($tableName, $type);
         return <<<EOD
 <com:TContent ID="$tContentId">   
                      
@@ -85,30 +85,30 @@ 
 
     private function getPageContent($tableName, $type)
     {
-        $code = "";
-        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-        switch ($type)
+        $code="";
+        $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
+        switch($type)
         {
             case self::LIST_TYPE:
                 break;
             case self::ADD_TYPE:
-                foreach ($tableInfo->getColumns() as $colField => $colMetadata)
+                foreach($tableInfo->getColumns() as $colField => $colMetadata)
                 {
-                    if (!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
+                    if(!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
                     {
-                        $code .= $this->generateControl($colMetadata);
-                        $code .= $this->generateValidators($colMetadata);
-                        $code .= "\n";
+                        $code.=$this->generateControl($colMetadata);
+                        $code.=$this->generateValidators($colMetadata);
+                        $code.="\n";
                     }
                 }
-                foreach ($tableInfo->getForeignKeys() as $colField => $colMetadata)
+                foreach($tableInfo->getForeignKeys() as $colField => $colMetadata)
                 {
-                    $colField = $this->eq($colMetadata["table"]);
-                    $code .= "\t<com:TTextBox ID=$colField />\n";
-                    $code .= "\n";
+                    $colField=$this->eq($colMetadata["table"]);
+                    $code.="\t<com:TTextBox ID=$colField />\n";
+                    $code.="\n";
                     //  TWsatBaseGenerator::pr($tableInfo);
                 }
-                $code .= "\t<com:TButton Text=\"Accept\" />\n";
+                $code.="\t<com:TButton Text=\"Accept\" />\n";
 
             case self::SHOW_TYPE:
                 break;
@@ -118,22 +118,22 @@ 
 
     private function generateControl($colMetadata)
     {
-        $controlType = "TTextBox";
-        switch ($colMetadata->DbType)
+        $controlType="TTextBox";
+        switch($colMetadata->DbType)
         {
             
         }
-        $controlId = $colMetadata->ColumnId;
+        $controlId=$colMetadata->ColumnId;
         return "\t<com:$controlType ID=\"$controlId\" />\n";
     }
 
     private function generateValidators($colMetadata)
     {
-        $controlId = $colMetadata->ColumnId;
-        $code = "";
-        if (!$colMetadata->AllowNull)
+        $controlId=$colMetadata->ColumnId;
+        $code="";
+        if(!$colMetadata->AllowNull)
         {
-            $code .= "\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
+            $code.="\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
         }
         return $code;
     }
@@ -143,8 +143,8 @@ 
     // <editor-fold defaultstate="collapsed" desc="Code Behind Generation">
     private function generateClass($classname)
     {
-        $date = date('Y-m-d h:i:s');
-        $env_user = getenv("username");
+        $date=date('Y-m-d h:i:s');
+        $env_user=getenv("username");
         return <<<EOD
 <?php
 /**

framework/Wsat/pages/layout/TWsatLayout.php

Spacing +5 added lines, -5 removed lines

@@ -16,11 +16,11 @@ 
 
         private function validateSecurity()
         {
-                if ($this->Session["wsat_password"] !== $this->getService()->getPassword())
+                if($this->Session["wsat_password"]!==$this->getService()->getPassword())
                 {
-                        if (!$this->getPage() instanceof TWsatLogin)
+                        if(!$this->getPage() instanceof TWsatLogin)
                         {
-                                $url = $this->Service->constructUrl('TWsatLogin');
+                                $url=$this->Service->constructUrl('TWsatLogin');
                                 $this->Response->redirect($url);
                         }
                 }
@@ -28,8 +28,8 @@ 
 
         public function logout()
         {
-                $this->Session["wsat_password"] = "";
-                $url = $this->Service->constructUrl('TWsatLogin');
+                $this->Session["wsat_password"]="";
+                $url=$this->Service->constructUrl('TWsatLogin');
                 $this->Response->redirect($url);
         }
 

framework/Wsat/pages/TWsatLogin.php

Spacing +6 added lines, -6 removed lines

@@ -14,19 +14,19 @@
 
         public function login()
         {
-                if ($this->IsValid)
+                if($this->IsValid)
                 {
-                        $this->Session["wsat_password"] = $this->getService()->getPassword();
-                        $url = $this->Service->constructUrl('TWsatHome');
+                        $this->Session["wsat_password"]=$this->getService()->getPassword();
+                        $url=$this->Service->constructUrl('TWsatHome');
                         $this->Response->redirect($url);
                 }
         }
 
         public function validatePassword($sender, $param)
         {
-                $config_pass = $this->Service->Password;
-                $user_pass = $this->password->Text;
-                $param->IsValid = $user_pass === $config_pass;
+                $config_pass=$this->Service->Password;
+                $user_pass=$this->password->Text;
+                $param->IsValid=$user_pass===$config_pass;
         }
 
 }
\ No newline at end of file

framework/Wsat/pages/TWsatScaffolding.php

Spacing +17 added lines, -17 removed lines

@@ -22,13 +22,13 @@ 
 
         private function startVisual()
         {
-                $scf_generator = new TWsatScaffoldingGenerator();
-                foreach ($scf_generator->getAllTableNames() as $tableName)
+                $scf_generator=new TWsatScaffoldingGenerator();
+                foreach($scf_generator->getAllTableNames() as $tableName)
                 {
-                        $dynChb = new TCheckBox();
-                        $dynChb->ID = "cb_$tableName";
-                        $dynChb->Text = ucfirst($tableName);
-                        $dynChb->Checked = true;
+                        $dynChb=new TCheckBox();
+                        $dynChb->ID="cb_$tableName";
+                        $dynChb->Text=ucfirst($tableName);
+                        $dynChb->Checked=true;
                         $this->registerObject("cb_$tableName", $dynChb);
                         $this->tableNames->getControls()->add($dynChb);
                         $this->tableNames->getControls()->add("</br>");
@@ -41,30 +41,30 @@ 
          */
         public function generate($sender)
         {
-                if ($this->IsValid)
+                if($this->IsValid)
                 {
                         try
                         {
-                                $scf_generator = new TWsatScaffoldingGenerator();
+                                $scf_generator=new TWsatScaffoldingGenerator();
                                 $scf_generator->setOpFile($this->output_folder->Text);
-                                foreach ($scf_generator->getAllTableNames() as $tableName)
+                                foreach($scf_generator->getAllTableNames() as $tableName)
                                 {
-                                        $id = "cb_$tableName";
-                                        $obj = $this->tableNames->findControl($id);
+                                        $id="cb_$tableName";
+                                        $obj=$this->tableNames->findControl($id);
                                         if($obj!==null && $obj->Checked)
                                         {
                                                 $scf_generator->generateCRUD($tableName);
                                         }
                                 }
                                 
-                                $this->feedback_panel->CssClass = "green_panel";
-                                $this->generation_msg->Text = "The code has been generated successfully.";
-                        } catch (Exception $ex)
+                                $this->feedback_panel->CssClass="green_panel";
+                                $this->generation_msg->Text="The code has been generated successfully.";
+                        } catch(Exception $ex)
                         {
-                                $this->feedback_panel->CssClass = "red_panel";
-                                $this->generation_msg->Text = $ex->getMessage();
+                                $this->feedback_panel->CssClass="red_panel";
+                                $this->generation_msg->Text=$ex->getMessage();
                         }
-                        $this->feedback_panel->Visible = true;
+                        $this->feedback_panel->Visible=true;
                 }
 
                 //   $scf_generator->renderAllTablesInformation();

framework/Wsat/pages/TWsatGenerateAR.php

Spacing +14 added lines, -14 removed lines

@@ -16,36 +16,36 @@
 
         public function generate($sender)
         {
-                if ($this->IsValid)
+                if($this->IsValid)
                 {
-                        $tableName = $this->table_name->Text;
-                        $outputFolderNs = $this->output_folder->Text;
-                        $classPrefix = $this->class_prefix->Text;
-                        $classSuffix = $this->class_suffix->Text;
+                        $tableName=$this->table_name->Text;
+                        $outputFolderNs=$this->output_folder->Text;
+                        $classPrefix=$this->class_prefix->Text;
+                        $classSuffix=$this->class_suffix->Text;
 
                         try
                         {
-                                $ar_generator = new TWsatARGenerator();
+                                $ar_generator=new TWsatARGenerator();
                                 $ar_generator->setOpFile($outputFolderNs);
                                 $ar_generator->setClasPrefix($classPrefix);
                                 $ar_generator->setClassSufix($classSuffix);
 
-                                if ($this->build_rel->Checked)
+                                if($this->build_rel->Checked)
                                         $ar_generator->buildRelations();
 
-                                if ($tableName != "*")
+                                if($tableName!="*")
                                         $ar_generator->generate($tableName);
                                 else
                                         $ar_generator->generateAll();
 
-                                $this->feedback_panel->CssClass = "green_panel";
-                                $this->generation_msg->Text = "The code has been generated successfully.";
-                        } catch (Exception $ex)
+                                $this->feedback_panel->CssClass="green_panel";
+                                $this->generation_msg->Text="The code has been generated successfully.";
+                        } catch(Exception $ex)
                         {
-                                $this->feedback_panel->CssClass = "red_panel";
-                                $this->generation_msg->Text = $ex->getMessage();
+                                $this->feedback_panel->CssClass="red_panel";
+                                $this->generation_msg->Text=$ex->getMessage();
                         }
-                        $this->feedback_panel->Visible = true;
+                        $this->feedback_panel->Visible=true;
                 }
         }
 

framework/Wsat/TWsatService.php

Spacing +9 added lines, -9 removed lines

@@ -36,14 +36,14 @@ 
 class TWsatService extends TPageService
 {
 
-        private $_pass = '';
+        private $_pass='';
 
         public function init($config)
         {
-                if ($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal)
+                if($this->getApplication()->getMode()===TApplicationMode::Performance || $this->getApplication()->getMode()===TApplicationMode::Normal)
                         throw new TInvalidOperationException("You should not use Prado WSAT in any of the production modes.");
 
-                if (empty($this->_pass))
+                if(empty($this->_pass))
                         throw new TConfigurationException("You need to specify the Password attribute.");
 
                 $this->setDefaultPage("TWsatHome");
@@ -53,16 +53,16 @@ 
 
         public function getBasePath()
         {
-                $basePath = Prado::getPathOfNamespace("System.Wsat.pages");
+                $basePath=Prado::getPathOfNamespace("System.Wsat.pages");
                 return realpath($basePath);
         }
 
         private function _startThemeManager()
         {
-                $themeManager = new TThemeManager;
-                $themeManager->BasePath = "System.Wsat.themes";
-                $url = Prado::getApplication()->getAssetManager()->publishFilePath(Prado::getPathOfNamespace('System.Wsat'));
-                $themeManager->BaseUrl = "$url/themes";
+                $themeManager=new TThemeManager;
+                $themeManager->BasePath="System.Wsat.themes";
+                $url=Prado::getApplication()->getAssetManager()->publishFilePath(Prado::getPathOfNamespace('System.Wsat'));
+                $themeManager->BaseUrl="$url/themes";
 
                 $themeManager->init(null);
                 $this->setThemeManager($themeManager);
@@ -75,7 +75,7 @@ 
 
         public function setPassword($_pass)
         {
-                $this->_pass = $_pass;
+                $this->_pass=$_pass;
         }
 
 }
\ No newline at end of file