pradosoft / prado

framework/Wsat/pages/TWsatScaffolding.php

Indentation +51 added lines, -51 removed lines

@@ -14,59 +14,59 @@
 class TWsatScaffolding extends TPage
 {
 
-        public function onInit($param)
-        {
-                parent::onInit($param);
-                $this->startVisual();
-        }
+		public function onInit($param)
+		{
+				parent::onInit($param);
+				$this->startVisual();
+		}
 
-        private function startVisual()
-        {
-                $scf_generator = new TWsatScaffoldingGenerator();
-                foreach ($scf_generator->getAllTableNames() as $tableName)
-                {
-                        $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>");
-                }
-        }
+		private function startVisual()
+		{
+				$scf_generator = new TWsatScaffoldingGenerator();
+				foreach ($scf_generator->getAllTableNames() as $tableName)
+				{
+						$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>");
+				}
+		}
 
-        /**
-         * Generate Scaffolding code for selected tables
-         * @param type $sender
-         */
-        public function generate($sender)
-        {
-                if ($this->IsValid)
-                {
-                        try
-                        {
-                                $scf_generator = new TWsatScaffoldingGenerator();
-                                $scf_generator->setOpFile($this->output_folder->Text);
-                                foreach ($scf_generator->getAllTableNames() as $tableName)
-                                {
-                                        $id = "cb_$tableName";
-                                        $obj = $this->tableNames->findControl($id);
-                                        if($obj!==null && $obj->Checked)
-                                        {
-                                                $scf_generator->generateCRUD($tableName);
-                                        }
-                                }
+		/**
+		 * Generate Scaffolding code for selected tables
+		 * @param type $sender
+		 */
+		public function generate($sender)
+		{
+				if ($this->IsValid)
+				{
+						try
+						{
+								$scf_generator = new TWsatScaffoldingGenerator();
+								$scf_generator->setOpFile($this->output_folder->Text);
+								foreach ($scf_generator->getAllTableNames() as $tableName)
+								{
+										$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 = "red_panel";
-                                $this->generation_msg->Text = $ex->getMessage();
-                        }
-                        $this->feedback_panel->Visible = true;
-                }
+								$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->Visible = true;
+				}
 
-                //   $scf_generator->renderAllTablesInformation();
-        }
+				//   $scf_generator->renderAllTablesInformation();
+		}
 }
\ No newline at end of file

framework/Wsat/pages/TWsatGenerateAR.php

Indentation +39 added lines, -39 removed lines

@@ -14,44 +14,44 @@
 class TWsatGenerateAR extends TPage
 {
 
-        public function generate($sender)
-        {
-                if ($this->IsValid)
-                {
-                        $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->setOpFile($outputFolderNs);
-                                $ar_generator->setClasPrefix($classPrefix);
-                                $ar_generator->setClassSufix($classSuffix);
-
-                                if ($this->build_rel->Checked)
-                                        $ar_generator->buildRelations();
-
-                                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 = "red_panel";
-                                $this->generation_msg->Text = $ex->getMessage();
-                        }
-                        $this->feedback_panel->Visible = true;
-                }
-        }
-
-        public function preview($sender)
-        {
-                throw new THttpException(500, "Not implemented yet.");
-        }
+		public function generate($sender)
+		{
+				if ($this->IsValid)
+				{
+						$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->setOpFile($outputFolderNs);
+								$ar_generator->setClasPrefix($classPrefix);
+								$ar_generator->setClassSufix($classSuffix);
+
+								if ($this->build_rel->Checked)
+										$ar_generator->buildRelations();
+
+								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 = "red_panel";
+								$this->generation_msg->Text = $ex->getMessage();
+						}
+						$this->feedback_panel->Visible = true;
+				}
+		}
+
+		public function preview($sender)
+		{
+				throw new THttpException(500, "Not implemented yet.");
+		}
 
 }
\ No newline at end of file

framework/Wsat/pages/layout/TWsatLayout.php

Indentation +22 added lines, -22 removed lines

@@ -8,29 +8,29 @@
 class TWsatLayout extends TTemplateControl
 {
 
-        public function onLoad($param)
-        {
-                parent::onLoad($param);
-                $this->validateSecurity();
-        }
+		public function onLoad($param)
+		{
+				parent::onLoad($param);
+				$this->validateSecurity();
+		}
 
-        private function validateSecurity()
-        {
-                if ($this->Session["wsat_password"] !== $this->getService()->getPassword())
-                {
-                        if (!$this->getPage() instanceof TWsatLogin)
-                        {
-                                $url = $this->Service->constructUrl('TWsatLogin');
-                                $this->Response->redirect($url);
-                        }
-                }
-        }
+		private function validateSecurity()
+		{
+				if ($this->Session["wsat_password"] !== $this->getService()->getPassword())
+				{
+						if (!$this->getPage() instanceof TWsatLogin)
+						{
+								$url = $this->Service->constructUrl('TWsatLogin');
+								$this->Response->redirect($url);
+						}
+				}
+		}
 
-        public function logout()
-        {
-                $this->Session["wsat_password"] = "";
-                $url = $this->Service->constructUrl('TWsatLogin');
-                $this->Response->redirect($url);
-        }
+		public function logout()
+		{
+				$this->Session["wsat_password"] = "";
+				$url = $this->Service->constructUrl('TWsatLogin');
+				$this->Response->redirect($url);
+		}
 
 }
\ No newline at end of file

framework/Wsat/pages/TWsatLogin.php

Indentation +15 added lines, -15 removed lines

@@ -12,21 +12,21 @@
 class TWsatLogin extends TPage
 {
 
-        public function login()
-        {
-                if ($this->IsValid)
-                {
-                        $this->Session["wsat_password"] = $this->getService()->getPassword();
-                        $url = $this->Service->constructUrl('TWsatHome');
-                        $this->Response->redirect($url);
-                }
-        }
+		public function login()
+		{
+				if ($this->IsValid)
+				{
+						$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;
-        }
+		public function validatePassword($sender, $param)
+		{
+				$config_pass = $this->Service->Password;
+				$user_pass = $this->password->Text;
+				$param->IsValid = $user_pass === $config_pass;
+		}
 
 }
\ No newline at end of file

framework/Wsat/TWsatARGenerator.php

Indentation +193 added lines, -193 removed lines

@@ -14,206 +14,206 @@ 
 class TWsatARGenerator extends TWsatBaseGenerator
 {
 
-        /**
-         * Class name prefix
-         */
-        private $_clasPrefix;
-
-        /**
-         * Class name sufix
-         */
-        private $_classSufix;
-
-        /**
-         * all table relations array
-         */
-        private $_relations;
-
-        /**
-         * unquote chars
-         * @var array
-         */
-        private $uqChars = array('[', ']', '"', '`', "'");
-
-        function __construct()
-        {
-                parent::__construct();
-        }
-
-        public function setClasPrefix($_clas_prefix)
-        {
-                $this->_clasPrefix = $_clas_prefix;
-        }
-
-        public function setClassSufix($_clas_sufix)
-        {
-                $this->_classSufix = $_clas_sufix;
-        }
+		/**
+		 * Class name prefix
+		 */
+		private $_clasPrefix;
+
+		/**
+		 * Class name sufix
+		 */
+		private $_classSufix;
+
+		/**
+		 * all table relations array
+		 */
+		private $_relations;
+
+		/**
+		 * unquote chars
+		 * @var array
+		 */
+		private $uqChars = array('[', ']', '"', '`', "'");
+
+		function __construct()
+		{
+				parent::__construct();
+		}
+
+		public function setClasPrefix($_clas_prefix)
+		{
+				$this->_clasPrefix = $_clas_prefix;
+		}
+
+		public function setClassSufix($_clas_sufix)
+		{
+				$this->_classSufix = $_clas_sufix;
+		}
 
 //-----------------------------------------------------------------------------
-        // <editor-fold defaultstate="collapsed" desc="Main APIs">
-        public function generate($tableName)
-        {
-                $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-                $this->_commonGenerate($tableName, $tableInfo);
-        }
-
-        public function generateAll()
-        {
-                foreach ($this->getAllTableNames() as $tableName)
-                {
-                        $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
-                                        continue;
-                        }
-                        $this->_commonGenerate($tableName, $tableInfo);
-                }
-        }
-
-        public function buildRelations()
-        {
-                $this->_relations = array();
-                foreach ($this->getAllTableNames() as $table_name)
-                {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-                        $pks = $tableInfo->getPrimaryKeys();
-                        $fks = $tableInfo->getForeignKeys();
-
-                        if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
-                        {
-                                $table_name_mm = $fks[0]["table"];
-                                $table_name_mm2 = $fks[1]["table"];
-
-                                $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(
-                                        "prop_name" => strtolower($table_name_mm),
-                                        "rel_type" => "self::MANY_TO_MANY",
-                                        "ref_class_name" => $this->_getProperClassName($table_name_mm),
-                                        "prop_ref" => $table_name
-                                );
-                                continue;
-                        }
-                        foreach ($fks as $fk_data)//1-M relationships
-                        {
-                                $owner_table = $fk_data["table"];
-                                $slave_table = $table_name;
-                                $fk_prop = key($fk_data["keys"]);
-
-                                $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(
-                                        "prop_name" => strtolower($owner_table),
-                                        "rel_type" => "self::BELONGS_TO",
-                                        "ref_class_name" => $this->_getProperClassName($owner_table),
-                                        "prop_ref" => $fk_prop
-                                );
-                        }
-                }
-        }
+		// <editor-fold defaultstate="collapsed" desc="Main APIs">
+		public function generate($tableName)
+		{
+				$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+				$this->_commonGenerate($tableName, $tableInfo);
+		}
+
+		public function generateAll()
+		{
+				foreach ($this->getAllTableNames() as $tableName)
+				{
+						$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
+										continue;
+						}
+						$this->_commonGenerate($tableName, $tableInfo);
+				}
+		}
+
+		public function buildRelations()
+		{
+				$this->_relations = array();
+				foreach ($this->getAllTableNames() as $table_name)
+				{
+						$tableInfo = $this->_dbMetaData->getTableInfo($table_name);
+						$pks = $tableInfo->getPrimaryKeys();
+						$fks = $tableInfo->getForeignKeys();
+
+						if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+						{
+								$table_name_mm = $fks[0]["table"];
+								$table_name_mm2 = $fks[1]["table"];
+
+								$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(
+										"prop_name" => strtolower($table_name_mm),
+										"rel_type" => "self::MANY_TO_MANY",
+										"ref_class_name" => $this->_getProperClassName($table_name_mm),
+										"prop_ref" => $table_name
+								);
+								continue;
+						}
+						foreach ($fks as $fk_data)//1-M relationships
+						{
+								$owner_table = $fk_data["table"];
+								$slave_table = $table_name;
+								$fk_prop = key($fk_data["keys"]);
+
+								$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(
+										"prop_name" => strtolower($owner_table),
+										"rel_type" => "self::BELONGS_TO",
+										"ref_class_name" => $this->_getProperClassName($owner_table),
+										"prop_ref" => $fk_prop
+								);
+						}
+				}
+		}
 
 // </editor-fold>
 //-----------------------------------------------------------------------------
-        // <editor-fold defaultstate="collapsed" desc="Common Methods">
-
-        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() . ".");
-                else
-                {
-                        $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";
-                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;
-        }
+		// <editor-fold defaultstate="collapsed" desc="Common Methods">
+
+		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() . ".");
+				else
+				{
+						$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";
+				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;
+		}
 
 //-----------------------------------------------------------------------------
 
-        protected function generateProperty($field, $metadata)
-        {
-                $prop = '';
-                $name = '$' . $field;
-
-                /* TODO use in version 2.0 */
-                // $type = $column->getPHPType();
-
-                $prop .= "\tpublic $name;";
-                return $prop;
-        }
-
-        private function _renderRelations($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 = 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.');";
-                try
-                {
-                        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")
-                                {
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
-                                        break;
-                                }
-                        }
-                } catch (Exception $ex)
-                {
-                        Prado::trace($ex->getMessage());
-                }
-                $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");
-                return <<<EOD
+		protected function generateProperty($field, $metadata)
+		{
+				$prop = '';
+				$name = '$' . $field;
+
+				/* TODO use in version 2.0 */
+				// $type = $column->getPHPType();
+
+				$prop .= "\tpublic $name;";
+				return $prop;
+		}
+
+		private function _renderRelations($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 = 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.');";
+				try
+				{
+						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")
+								{
+										$property = str_replace($this->uqChars, "", $column->ColumnName);
+										break;
+								}
+						}
+				} catch (Exception $ex)
+				{
+						Prado::trace($ex->getMessage());
+				}
+				$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");
+				return <<<EOD
 <?php
 /**
  * Auto generated by PRADO - WSAT on $date.
@@ -234,7 +234,7 @@ 
 $toString
 }
 EOD;
-        }
+		}
 
 // </editor-fold>
 }
\ No newline at end of file

requirements/index.php

Indentation +25 added lines, -25 removed lines

@@ -62,31 +62,31 @@
 		class_exists("DOMDocument",false),
 		'DOM extension check',
 		'DOM extension required'),
-    array(
-        true,
-        extension_loaded("SPL"),
-        'SPL extension check',
-        'SPL extension required'),
-    array(
-        true,
-        extension_loaded("CType"),
-        'CType extension check',
-        'CType extension required'),
-    array(
-        true,
-        extension_loaded("pcre"),
-        'PCRE extension check',
-        'PCRE extension required'),
-    array(
-        true,
-        extension_loaded("json"),
-        'JSON extension check',
-        'JSON extension required'),
-    array(
-        false,
-        class_exists("PDO",false),
-        'PDO extension check',
-        'PDO extension optional'),
+	array(
+		true,
+		extension_loaded("SPL"),
+		'SPL extension check',
+		'SPL extension required'),
+	array(
+		true,
+		extension_loaded("CType"),
+		'CType extension check',
+		'CType extension required'),
+	array(
+		true,
+		extension_loaded("pcre"),
+		'PCRE extension check',
+		'PCRE extension required'),
+	array(
+		true,
+		extension_loaded("json"),
+		'JSON extension check',
+		'JSON extension required'),
+	array(
+		false,
+		class_exists("PDO",false),
+		'PDO extension check',
+		'PDO extension optional'),
 	array(
 		false,
 		function_exists("iconv"),

bin/prado-cli.php

Indentation +94 added lines, -94 removed lines

@@ -740,89 +740,89 @@ 
  */
 class PradoCommandLineActiveRecordGenAll extends PradoCommandLineAction {
 
-    protected $action = 'generateAll';
-    protected $parameters = array('output');
-    protected $optional = array('directory', 'soap', 'overwrite', 'prefix', 'postfix');
-    protected $description = "Generate Active Record skeleton for all Tables to <output> file using application.xml in [directory]. May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Postfix]. [Overwrite] is used to overwrite existing Files.";
-    private $_soap = false;
-    private $_prefix = '';
-    private $_postfix = '';
-    private $_overwrite = false;
-
-    public function performAction($args) {
-        $app_dir = count($args) > 2 ? $this->getAppDir($args[2]) : $this->getAppDir();
-        $this->_soap = count($args) > 3 ? ($args[3] == "soap" || $args[3] == "true" ? true : false) : false;
-        $this->_overwrite = count($args) > 4 ? ($args[4] == "overwrite" || $args[4] == "true" ? true : false) : false;
-        $this->_prefix = count($args) > 5 ? $args[5] : '';
-        $this->_postfix = count($args) > 6 ? $args[6] : '';
-
-        if ($app_dir !== false) {
-            $config = $this->getActiveRecordConfig($app_dir);
-
-            $manager = TActiveRecordManager::getInstance();
-            $con = $manager->getDbConnection();
-            $con->Active = true;
-            $command = $con->createCommand("Show Tables");
-            $dataReader = $command->query();
-            $dataReader->bindColumn(1, $table);
-            $generator = new PHP_Shell_Extensions_ActiveRecord();
-            $tables = array();
-            while ($dataReader->read() !== false) {
-                $tables[] = $table;
-            }
-            $con->Active = False;
-            foreach ($tables as $key => $table) {
-                $output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
-                if ($config !== false && $output !== false) {
-                    $generator->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
-                }
-            }
-        }
-        return true;
-    }
-
-    protected function getAppDir($dir=".") {
-        if (is_dir($dir))
-            return realpath($dir);
-        if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
-            return $app_dir;
-        echo '** Unable to find directory "' . $dir . "\".\n";
-        return false;
-    }
-
-    protected function getXmlFile($app_dir) {
-        if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
-            return $xml;
-        if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
-            return $xml;
-        echo '** Unable to find application.xml in ' . $app_dir . "\n";
-        return false;
-    }
-
-    protected function getActiveRecordConfig($app_dir) {
-        if (false === ($xml = $this->getXmlFile($app_dir)))
-            return false;
-        if (false !== ($app = $this->initializePradoApplication($app_dir))) {
-            Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
-            foreach ($app->getModules() as $module)
-                if ($module instanceof TActiveRecordConfig)
-                    return $module;
-            echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
-        }
-        return false;
-    }
-
-    protected function getOutputFile($app_dir, $namespace) {
-        if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
-            return $namespace;
-        $file = Prado::getPathOfNamespace($namespace, "");
-        if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
-            if (strpos($path, $app_dir) === 0)
-                return $file;
-        }
-        echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
-        return false;
-    }
+	protected $action = 'generateAll';
+	protected $parameters = array('output');
+	protected $optional = array('directory', 'soap', 'overwrite', 'prefix', 'postfix');
+	protected $description = "Generate Active Record skeleton for all Tables to <output> file using application.xml in [directory]. May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Postfix]. [Overwrite] is used to overwrite existing Files.";
+	private $_soap = false;
+	private $_prefix = '';
+	private $_postfix = '';
+	private $_overwrite = false;
+
+	public function performAction($args) {
+		$app_dir = count($args) > 2 ? $this->getAppDir($args[2]) : $this->getAppDir();
+		$this->_soap = count($args) > 3 ? ($args[3] == "soap" || $args[3] == "true" ? true : false) : false;
+		$this->_overwrite = count($args) > 4 ? ($args[4] == "overwrite" || $args[4] == "true" ? true : false) : false;
+		$this->_prefix = count($args) > 5 ? $args[5] : '';
+		$this->_postfix = count($args) > 6 ? $args[6] : '';
+
+		if ($app_dir !== false) {
+			$config = $this->getActiveRecordConfig($app_dir);
+
+			$manager = TActiveRecordManager::getInstance();
+			$con = $manager->getDbConnection();
+			$con->Active = true;
+			$command = $con->createCommand("Show Tables");
+			$dataReader = $command->query();
+			$dataReader->bindColumn(1, $table);
+			$generator = new PHP_Shell_Extensions_ActiveRecord();
+			$tables = array();
+			while ($dataReader->read() !== false) {
+				$tables[] = $table;
+			}
+			$con->Active = False;
+			foreach ($tables as $key => $table) {
+				$output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
+				if ($config !== false && $output !== false) {
+					$generator->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
+				}
+			}
+		}
+		return true;
+	}
+
+	protected function getAppDir($dir=".") {
+		if (is_dir($dir))
+			return realpath($dir);
+		if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
+			return $app_dir;
+		echo '** Unable to find directory "' . $dir . "\".\n";
+		return false;
+	}
+
+	protected function getXmlFile($app_dir) {
+		if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
+			return $xml;
+		if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
+			return $xml;
+		echo '** Unable to find application.xml in ' . $app_dir . "\n";
+		return false;
+	}
+
+	protected function getActiveRecordConfig($app_dir) {
+		if (false === ($xml = $this->getXmlFile($app_dir)))
+			return false;
+		if (false !== ($app = $this->initializePradoApplication($app_dir))) {
+			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
+			foreach ($app->getModules() as $module)
+				if ($module instanceof TActiveRecordConfig)
+					return $module;
+			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
+		}
+		return false;
+	}
+
+	protected function getOutputFile($app_dir, $namespace) {
+		if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
+			return $namespace;
+		$file = Prado::getPathOfNamespace($namespace, "");
+		if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
+			if (strpos($path, $app_dir) === 0)
+				return $file;
+		}
+		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
+		return false;
+	}
 
 }
 
@@ -830,20 +830,20 @@ 
 if(class_exists('PHP_Shell_Commands', false))
 {
 	class PHP_Shell_Extensions_ActiveRecord implements PHP_Shell_Extension {
-	    public function register()
-	    {
+		public function register()
+		{
 
-	        $cmd = PHP_Shell_Commands::getInstance();
+			$cmd = PHP_Shell_Commands::getInstance();
 			if(Prado::getApplication() !== null)
 			{
-		        $cmd->registerCommand('#^generate#', $this, 'generate', 'generate <table> <output> [soap]',
-		            'Generate Active Record skeleton for <table> to <output> file using'.PHP_EOL.
-		            '    application.xml in [directory]. May also generate [soap] properties.');
+				$cmd->registerCommand('#^generate#', $this, 'generate', 'generate <table> <output> [soap]',
+					'Generate Active Record skeleton for <table> to <output> file using'.PHP_EOL.
+					'    application.xml in [directory]. May also generate [soap] properties.');
 			}
-	    }
+		}
 
-	    public function generate($l)
-	    {
+		public function generate($l)
+		{
 			$input = explode(" ", trim($l));
 			if(count($input) > 2)
 			{
@@ -860,12 +860,12 @@ 
 			{
 				echo "\n    Usage: generate table_name Application.pages.RecordClassName\n";
 			}
-	    }
+		}
 	}
 
 	$__shell_exts = PHP_Shell_Extensions::getInstance();
 	$__shell_exts->registerExtensions(array(
-		    "active-record"        => new PHP_Shell_Extensions_ActiveRecord)); /* the :set command */
+			"active-record"        => new PHP_Shell_Extensions_ActiveRecord)); /* the :set command */
 
 	include_once(realpath(dirname(dirname(__FILE__))).'/framework/3rdParty/PhpShell/php-shell-cmd.php');
 }

framework/pradolite.php

Indentation +87 added lines, -87 removed lines

@@ -4203,10 +4203,10 @@ 
 		{
 			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
-      {
+	  {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
+	  }
 			else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');
@@ -6805,77 +6805,77 @@ 
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
-        public function tryToUpdateView($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key != "RELATIONS")
-                                {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
-                                }
-                                else
-                                {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
-                                        {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
-                                                {
-                                                        case TActiveRecord::BELONGS_TO:
-                                                        case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
-                                                                break;
-                                                        case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
-                                                                {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
-                                                                        $relControl->dataBind();
-                                                                }
-                                                                break;
-                                                }
-                                        }
-                                        break;
-                                }
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key == "RELATIONS")
-                                        break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		public function tryToUpdateView($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key != "RELATIONS")
+								{
+										$control = $this->{$key};
+										if ($control instanceof TTextBox)
+												$control->Text = $arObj->{$key};
+										elseif ($control instanceof TCheckBox)
+												$control->Checked = (boolean) $arObj->{$key};
+										elseif ($control instanceof TDatePicker)
+												$control->Date = $arObj->{$key};
+								}
+								else
+								{
+										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+										{
+												$relControl = $this->{$relKey};
+												switch ($relValues[0])
+												{
+														case TActiveRecord::BELONGS_TO:
+														case TActiveRecord::HAS_ONE:
+																$relControl->Text = $arObj->{$relKey};
+																break;
+														case TActiveRecord::HAS_MANY:
+																if ($relControl instanceof TListControl)
+																{
+																		$relControl->DataSource = $arObj->{$relKey};
+																		$relControl->dataBind();
+																}
+																break;
+												}
+										}
+										break;
+								}
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
+		public function tryToUpdateAR($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key == "RELATIONS")
+										break;
+								$control = $this->{$key};
+								if ($control instanceof TTextBox)
+										$arObj->{$key} = $control->Text;
+								elseif ($control instanceof TCheckBox)
+										$arObj->{$key} = $control->Checked;
+								elseif ($control instanceof TDatePicker)
+										$arObj->{$key} = $control->Date;
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 }
 class TForm extends TControl
 {
@@ -7536,13 +7536,13 @@ 
 	{
 		Prado::using('System.Web.UI.ActiveControls.TActivePageAdapter');
 		$this->setAdapter(new TActivePageAdapter($this));
-        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-        if(strlen($callbackEventParameter) > 0)
-            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
-                if (($g=$this->getApplication()->getGlobalization(false))!==null &&
-            strtoupper($enc=$g->getCharset())!='UTF-8')
-                foreach ($this->_postData as $k=>$v)
-                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+		if(strlen($callbackEventParameter) > 0)
+			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+				if (($g=$this->getApplication()->getGlobalization(false))!==null &&
+			strtoupper($enc=$g->getCharset())!='UTF-8')
+				foreach ($this->_postData as $k=>$v)
+					$this->_postData[$k]=self::decodeUTF8($v, $enc);
 		$this->onPreInit(null);
 		$this->initRecursive();
 		$this->onInitComplete(null);
@@ -9127,15 +9127,15 @@ 
 	  $component=new ReflectionClass('TComponent');
 	  $behaviors=$component->getStaticProperties();
 	  if(!isset($behaviors['_um']))
-	    return false;
+		return false;
 	  foreach($behaviors['_um'] as $name=>$list)
 	  {
-	    if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
-	    foreach($list as $param)
-	    {
-	      if(method_exists($param->getBehavior(),$method))
-	        return true;
-	    }
+		if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
+		foreach($list as $param)
+		{
+		  if(method_exists($param->getBehavior(),$method))
+			return true;
+		}
 	  }
 	  return false;
 	}

framework/Web/UI/JuiControls/TJuiProgressbar.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TJuiProgressbar class file.
- *
- * @author Fabio Bas <ctrlaltca[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2013-2015 PradoSoft
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.JuiControls
- */
+	 * TJuiProgressbar class file.
+	 *
+	 * @author Fabio Bas <ctrlaltca[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2013-2015 PradoSoft
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.JuiControls
+	 */
 
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');