pradosoft / prado

framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php

Spacing +19 added lines, -19 removed lines

@@ -65,12 +65,12 @@ 
 		$table = $this->getTableInfo();
 		$sorts = ['Sort By', str_repeat('-', 15)];
 		$headers = [];
-		foreach($table->getColumns() as $name => $colum)
+		foreach ($table->getColumns() as $name => $colum)
 		{
 			$fname = ucwords(str_replace('_', ' ', $name));
-			$sorts[$name . ' ASC'] = $fname . ' Ascending';
-			$sorts[$name . ' DESC'] = $fname . ' Descending';
-			$headers[] = $fname ;
+			$sorts[$name.' ASC'] = $fname.' Ascending';
+			$sorts[$name.' DESC'] = $fname.' Descending';
+			$headers[] = $fname;
 		}
 		$this->_sort->setDataSource($sorts);
 		$this->_sort->dataBind();
@@ -84,7 +84,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(!$this->getPage()->getIsPostBack() || $this->getViewState('CurrentClass') != $this->getRecordClass())
+		if (!$this->getPage()->getIsPostBack() || $this->getViewState('CurrentClass') != $this->getRecordClass())
 		{
 			$this->initializeSort();
 			$this->setViewState('CurrentClass', $this->getRecordClass());
@@ -113,17 +113,17 @@ 
 		$total = $this->_list->getVirtualItemCount();
 		$limit = $this->_list->getPageSize();
 		$offset = $this->_list->getCurrentPageIndex() * $limit;
-		if($offset + $limit > $total)
+		if ($offset + $limit > $total)
 			$limit = $total - $offset;
 		$criteria = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
-		if($limit > 0)
+		if ($limit > 0)
 		{
 			$criteria->setLimit($limit);
-			if($offset <= $total)
+			if ($offset <= $total)
 				$criteria->setOffset($offset);
 		}
 		$order = explode(' ', $this->_sort->getSelectedValue(), 2);
-		if(is_array($order) && count($order) === 2)
+		if (is_array($order) && count($order) === 2)
 			$criteria->OrdersBy[$order[0]] = $order[1];
 		return $criteria;
 	}
@@ -165,7 +165,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		switch(strtolower($param->getCommandName()))
+		switch (strtolower($param->getCommandName()))
 		{
 			case 'delete':
 				return $this->deleteRecord($sender, $param);
@@ -181,9 +181,9 @@ 
 	 */
 	protected function initializeEdit($sender, $param)
 	{
-		if(($ctrl = $this->getEditViewControl()) !== null)
+		if (($ctrl = $this->getEditViewControl()) !== null)
 		{
-			if($param instanceof TRepeaterCommandEventParameter)
+			if ($param instanceof TRepeaterCommandEventParameter)
 			{
 				$pk = $param->getItem()->getCustomData();
 				$ctrl->setRecordPk($pk);
@@ -197,7 +197,7 @@ 
 	 */
 	protected function deleteRecord($sender, $param)
 	{
-		if($param instanceof TRepeaterCommandEventParameter)
+		if ($param instanceof TRepeaterCommandEventParameter)
 		{
 			$pk = $param->getItem()->getCustomData();
 			$this->getRecordFinder()->deleteByPk($pk);
@@ -210,10 +210,10 @@ 
 	protected function listItemCreated($sender, $param)
 	{
 		$item = $param->getItem();
-		if($item instanceof IItemDataRenderer)
+		if ($item instanceof IItemDataRenderer)
 		{
 			$type = $item->getItemType();
-			if($type == TListItemType::Item || $type == TListItemType::AlternatingItem)
+			if ($type == TListItemType::Item || $type == TListItemType::AlternatingItem)
 				$this->populateField($sender, $param);
 		}
 	}
@@ -225,10 +225,10 @@ 
 	protected function populateField($sender, $param)
 	{
 		$item = $param->getItem();
-		if(($data = $item->getData()) !== null)
+		if (($data = $item->getData()) !== null)
 		{
 			$item->setCustomData($this->getRecordPkValues($data));
-			if(($prop = $item->findControl('_properties')) !== null)
+			if (($prop = $item->findControl('_properties')) !== null)
 			{
 				$item->_properties->setDataSource($this->getRecordPropertyValues($data));
 				$item->_properties->dataBind();
@@ -301,10 +301,10 @@ 
 	 */
 	protected function getEditViewControl()
 	{
-		if(($id = $this->getEditViewID()) !== null)
+		if (($id = $this->getEditViewID()) !== null)
 		{
 			$ctrl = $this->getParent()->findControl($id);
-			if($ctrl === null)
+			if ($ctrl === null)
 				throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
 			return $ctrl;
 		}

Braces +15 added lines, -10 removed lines

@@ -113,18 +113,21 @@ 
 		$total = $this->_list->getVirtualItemCount();
 		$limit = $this->_list->getPageSize();
 		$offset = $this->_list->getCurrentPageIndex() * $limit;
-		if($offset + $limit > $total)
-			$limit = $total - $offset;
+		if($offset + $limit > $total) {
+					$limit = $total - $offset;
+		}
 		$criteria = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
 		if($limit > 0)
 		{
 			$criteria->setLimit($limit);
-			if($offset <= $total)
-				$criteria->setOffset($offset);
+			if($offset <= $total) {
+							$criteria->setOffset($offset);
+			}
 		}
 		$order = explode(' ', $this->_sort->getSelectedValue(), 2);
-		if(is_array($order) && count($order) === 2)
-			$criteria->OrdersBy[$order[0]] = $order[1];
+		if(is_array($order) && count($order) === 2) {
+					$criteria->OrdersBy[$order[0]] = $order[1];
+		}
 		return $criteria;
 	}
 
@@ -213,8 +216,9 @@ 
 		if($item instanceof IItemDataRenderer)
 		{
 			$type = $item->getItemType();
-			if($type == TListItemType::Item || $type == TListItemType::AlternatingItem)
-				$this->populateField($sender, $param);
+			if($type == TListItemType::Item || $type == TListItemType::AlternatingItem) {
+							$this->populateField($sender, $param);
+			}
 		}
 	}
 
@@ -304,8 +308,9 @@ 
 		if(($id = $this->getEditViewID()) !== null)
 		{
 			$ctrl = $this->getParent()->findControl($id);
-			if($ctrl === null)
-				throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
+			if($ctrl === null) {
+							throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
+			}
 			return $ctrl;
 		}
 	}

framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php

Spacing +9 added lines, -9 removed lines

@@ -59,7 +59,7 @@ 
 	protected function getRecordPropertyValues($record)
 	{
 		$data = [];
-		foreach($this->getTableInfo()->getColumns() as $name => $column)
+		foreach ($this->getTableInfo()->getColumns() as $name => $column)
 			$data[] = $record->getColumnValue($name);
 		return $data;
 	}
@@ -71,9 +71,9 @@ 
 	protected function getRecordPkValues($record)
 	{
 		$data = [];
-		foreach($this->getTableInfo()->getColumns() as $name => $column)
+		foreach ($this->getTableInfo()->getColumns() as $name => $column)
 		{
-			if($column->getIsPrimaryKey())
+			if ($column->getIsPrimaryKey())
 				$data[] = $record->getColumnValue($name);
 		}
 		return $data;
@@ -124,19 +124,19 @@ 
 	 */
 	protected function getRecordObject($pk = null)
 	{
-		if($this->_record === null)
+		if ($this->_record === null)
 		{
-			if($pk !== null)
+			if ($pk !== null)
 			{
 				$this->_record = $this->getRecordFinder()->findByPk($pk);
-				if($this->_record === null)
+				if ($this->_record === null)
 					throw new TConfigurationException('scaffold_invalid_record_pk',
 						$this->getRecordClass(), $pk);
 			}
 			else
 			{
 				$class = $this->getRecordClass();
-				if($class !== null)
+				if ($class !== null)
 					$this->_record = Prado::createComponent($class);
 				else
 				{
@@ -202,9 +202,9 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if($this->getEnableDefaultStyle())
+		if ($this->getEnableDefaultStyle())
 		{
-			$url = $this->publishAsset($this->getDefaultStyle() . '.css');
+			$url = $this->publishAsset($this->getDefaultStyle().'.css');
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}

Braces +13 added lines, -11 removed lines

@@ -59,8 +59,9 @@ 
 	protected function getRecordPropertyValues($record)
 	{
 		$data = [];
-		foreach($this->getTableInfo()->getColumns() as $name => $column)
-			$data[] = $record->getColumnValue($name);
+		foreach($this->getTableInfo()->getColumns() as $name => $column) {
+					$data[] = $record->getColumnValue($name);
+		}
 		return $data;
 	}
 
@@ -73,8 +74,9 @@ 
 		$data = [];
 		foreach($this->getTableInfo()->getColumns() as $name => $column)
 		{
-			if($column->getIsPrimaryKey())
-				$data[] = $record->getColumnValue($name);
+			if($column->getIsPrimaryKey()) {
+							$data[] = $record->getColumnValue($name);
+			}
 		}
 		return $data;
 	}
@@ -129,16 +131,16 @@ 
 			if($pk !== null)
 			{
 				$this->_record = $this->getRecordFinder()->findByPk($pk);
-				if($this->_record === null)
-					throw new TConfigurationException('scaffold_invalid_record_pk',
+				if($this->_record === null) {
+									throw new TConfigurationException('scaffold_invalid_record_pk',
 						$this->getRecordClass(), $pk);
-			}
-			else
+				}
+			} else
 			{
 				$class = $this->getRecordClass();
-				if($class !== null)
-					$this->_record = Prado::createComponent($class);
-				else
+				if($class !== null) {
+									$this->_record = Prado::createComponent($class);
+				} else
 				{
 					throw new TConfigurationException('scaffold_invalid_record_class',
 						$this->getRecordClass(), $this->getID());

framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php

Spacing +7 added lines, -7 removed lines

@@ -17,8 +17,8 @@ 
 {
 	protected function createControl($container, $column, $record)
 	{
-		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['','',], strtolower($column->getDbType())));
-		switch($dbtype)
+		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['', '', ], strtolower($column->getDbType())));
+		switch ($dbtype)
 		{
 			case 'date':
 				return $this->createDateControl($container, $column, $record);
@@ -46,8 +46,8 @@ 
 
 	protected function getControlValue($container, $column, $record)
 	{
-		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['','',], strtolower($column->getDbType())));
-		switch($dbtype)
+		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['', '', ], strtolower($column->getDbType())));
+		switch ($dbtype)
 		{
 			case 'date':
 				return $container->findControl(self::DEFAULT_ID)->getDate();
@@ -70,7 +70,7 @@ 
 
 	protected function createIntegerControl($container, $column, $record)
 	{
-		if($column->getColumnSize() == 1)
+		if ($column->getColumnSize() == 1)
 			return $this->createBooleanControl($container, $column, $record);
 		else
 			parent::createIntegerControl($container, $column, $record);
@@ -78,8 +78,8 @@ 
 
 	protected function getIntBooleanValue($container, $column, $record)
 	{
-		if($column->getColumnSize() == 1)
-			return (int)$container->findControl(self::DEFAULT_ID)->getChecked();
+		if ($column->getColumnSize() == 1)
+			return (int) $container->findControl(self::DEFAULT_ID)->getChecked();
 		else
 			return $this->getDefaultControlValue($container, $column, $record);
 	}

Braces +10 added lines, -8 removed lines

@@ -70,18 +70,20 @@
 
 	protected function createIntegerControl($container, $column, $record)
 	{
-		if($column->getColumnSize() == 1)
-			return $this->createBooleanControl($container, $column, $record);
-		else
-			parent::createIntegerControl($container, $column, $record);
+		if($column->getColumnSize() == 1) {
+					return $this->createBooleanControl($container, $column, $record);
+		} else {
+					parent::createIntegerControl($container, $column, $record);
+		}
 	}
 
 	protected function getIntBooleanValue($container, $column, $record)
 	{
-		if($column->getColumnSize() == 1)
-			return (int)$container->findControl(self::DEFAULT_ID)->getChecked();
-		else
-			return $this->getDefaultControlValue($container, $column, $record);
+		if($column->getColumnSize() == 1) {
+					return (int)$container->findControl(self::DEFAULT_ID)->getChecked();
+		} else {
+					return $this->getDefaultControlValue($container, $column, $record);
+		}
 	}
 }
 

framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php

Spacing +22 added lines, -22 removed lines

@@ -40,7 +40,7 @@ 
 	protected function setNotNullProperty($container, $control, $column, $record)
 	{
 		$this->setDefaultProperty($container, $control, $column, $record);
-		if(!$column->getAllowNull() && !$column->hasSequence())
+		if (!$column->getAllowNull() && !$column->hasSequence())
 			$this->createRequiredValidator($container, $column, $record);
 	}
 
@@ -60,7 +60,7 @@ 
 		$control = new TTextBox();
 		$control->setText($value);
 		$control->setCssClass('default-textbox scaffold_input');
-		if(($len = $column->getColumnSize()) !== null)
+		if (($len = $column->getColumnSize()) !== null)
 			$control->setMaxLength($len);
 		$this->setNotNullProperty($container, $control, $column, $record);
 		return $control;
@@ -69,9 +69,9 @@ 
 	protected function getDefaultControlValue($container, $column, $record)
 	{
 		$control = $container->findControl(self::DEFAULT_ID);
-		if($control instanceof TCheckBox)
+		if ($control instanceof TCheckBox)
 			return $control->getChecked();
-		elseif($control instanceof TControl)
+		elseif ($control instanceof TControl)
 			return $control->getText();
 	}
 
@@ -93,7 +93,7 @@ 
 		$years = [];
 		$current = intval(@date('Y'));
 		$from = $current - 10; $to = $current + 10;
-		for($i = $from; $i <= $to; $i++)
+		for ($i = $from; $i <= $to; $i++)
 			$years[$i] = $i;
 		$control->setDataSource($years);
 		$control->setSelectedValue(empty($value) ? $current : $value);
@@ -117,13 +117,13 @@ 
 		$val = $this->createTypeValidator($container, $column, $record);
 		$val->setDataType(TValidationDataType::Float);
 		$val->setErrorMessage('Please entery a decimal number.');
-		if(($max = $column->getMaxiumNumericConstraint()) !== null)
+		if (($max = $column->getMaxiumNumericConstraint()) !== null)
 		{
 			$val = $this->createRangeValidator($container, $column, $record);
 			$val->setDataType(TValidationDataType::Float);
 			$val->setMaxValue($max);
 			$val->setStrictComparison(true);
-			$val->setErrorMessage('Please entery a decimal number strictly less than ' . $max . '.');
+			$val->setErrorMessage('Please entery a decimal number strictly less than '.$max.'.');
 		}
 		return $control;
 	}
@@ -169,20 +169,20 @@ 
 	{
 		$value = $this->getRecordPropertyValue($column, $record);
 		$hours = [];
-		for($i = 0;$i < 24;$i++) $hours[] = str_pad($i, 2, '0', STR_PAD_LEFT);
+		for ($i = 0; $i < 24; $i++) $hours[] = str_pad($i, 2, '0', STR_PAD_LEFT);
 		$mins = [];
-		for($i = 0;$i < 60;$i++) $mins[] = str_pad($i, 2, '0', STR_PAD_LEFT);
+		for ($i = 0; $i < 60; $i++) $mins[] = str_pad($i, 2, '0', STR_PAD_LEFT);
 		$hour = intval(@date('H'));
 		$min = intval(@date('i'));
 		$sec = intval(@date('s'));
-		if(!empty($value))
+		if (!empty($value))
 		{
 			$match = [];
-			if(preg_match('/(\d+):(\d+):?(\d+)?/', $value, $match))
+			if (preg_match('/(\d+):(\d+):?(\d+)?/', $value, $match))
 			{
 				$hour = $match[1];
 				$min = $match[2];
-				if(isset($match[3]))
+				if (isset($match[3]))
 					$sec = $match[3];
 			}
 		}
@@ -210,7 +210,7 @@ 
 		$scontrol->setSelectedValue(intval($sec));
 		$container->Controls[] = $scontrol;
 
-		return [$hcontrol,$mcontrol,$scontrol];
+		return [$hcontrol, $mcontrol, $scontrol];
 	}
 
 
@@ -221,7 +221,7 @@ 
 		$control->setFromYear(1900);
 		$control->setInputMode(TDatePickerInputMode::DropDownList);
 		$control->setDateFormat('yyyy-MM-dd');
-		if(!empty($value))
+		if (!empty($value))
 			$control->setDate(substr($value, 0, 10));
 		$control->setCssClass('date-dropdown');
 		$this->setNotNullProperty($container, $control, $column, $record);
@@ -234,14 +234,14 @@ 
 		$control = $this->createDateControl($container, $column, $record);
 		$container->Controls[] = ' @ ';
 		$time = $this->createTimeControl($container, $column, $record);
-		if(!empty($value))
+		if (!empty($value))
 		{
 			$match = [];
-			if(preg_match('/(\d+):(\d+):?(\d+)?/', substr($value, 11), $match))
+			if (preg_match('/(\d+):(\d+):?(\d+)?/', substr($value, 11), $match))
 			{
 				$time[0]->setSelectedValue(intval($match[1]));
 				$time[1]->setSelectedValue(intval($match[2]));
-				if(isset($match[3]))
+				if (isset($match[3]))
 					$time[2]->setSelectedValue(intval($match[3]));
 			}
 		}
@@ -284,9 +284,9 @@ 
 	protected function getMatchingIndices($checks, $values)
 	{
 		$index = [];
-		for($i = 0, $k = count($checks); $i < $k; $i++)
+		for ($i = 0, $k = count($checks); $i < $k; $i++)
 		{
-			if(in_array($checks[$i], $values))
+			if (in_array($checks[$i], $values))
 				$index[] = $i;
 		}
 		return $index;
@@ -301,7 +301,7 @@ 
 		$control->setDataSource($values);
 		$control->dataBind();
 		$index = $this->getMatchingIndices($values, $selectedValues);
-		if(count($index) > 0)
+		if (count($index) > 0)
 			$control->setSelectedIndex($index[0]);
 		$control->setID(self::DEFAULT_ID);
 		$control->setCssClass('enum-radio-buttons');
@@ -312,9 +312,9 @@ 
 	protected function getSetValue($container, $column, $record)
 	{
 		$value = [];
-		foreach($container->findControl(self::DEFAULT_ID)->getItems() as $item)
+		foreach ($container->findControl(self::DEFAULT_ID)->getItems() as $item)
 		{
-			if($item->getSelected())
+			if ($item->getSelected())
 				$value[] = $item->getText();
 		}
 		return implode(',', $value);

Braces +38 added lines, -24 removed lines

@@ -40,8 +40,9 @@ 
 	protected function setNotNullProperty($container, $control, $column, $record)
 	{
 		$this->setDefaultProperty($container, $control, $column, $record);
-		if(!$column->getAllowNull() && !$column->hasSequence())
-			$this->createRequiredValidator($container, $column, $record);
+		if(!$column->getAllowNull() && !$column->hasSequence()) {
+					$this->createRequiredValidator($container, $column, $record);
+		}
 	}
 
 	protected function createBooleanControl($container, $column, $record)
@@ -60,8 +61,9 @@ 
 		$control = new TTextBox();
 		$control->setText($value);
 		$control->setCssClass('default-textbox scaffold_input');
-		if(($len = $column->getColumnSize()) !== null)
-			$control->setMaxLength($len);
+		if(($len = $column->getColumnSize()) !== null) {
+					$control->setMaxLength($len);
+		}
 		$this->setNotNullProperty($container, $control, $column, $record);
 		return $control;
 	}
@@ -69,10 +71,11 @@ 
 	protected function getDefaultControlValue($container, $column, $record)
 	{
 		$control = $container->findControl(self::DEFAULT_ID);
-		if($control instanceof TCheckBox)
-			return $control->getChecked();
-		elseif($control instanceof TControl)
-			return $control->getText();
+		if($control instanceof TCheckBox) {
+					return $control->getChecked();
+		} elseif($control instanceof TControl) {
+					return $control->getText();
+		}
 	}
 
 	protected function createMultiLineControl($container, $column, $record)
@@ -93,8 +96,9 @@ 
 		$years = [];
 		$current = intval(@date('Y'));
 		$from = $current - 10; $to = $current + 10;
-		for($i = $from; $i <= $to; $i++)
-			$years[$i] = $i;
+		for($i = $from; $i <= $to; $i++) {
+					$years[$i] = $i;
+		}
 		$control->setDataSource($years);
 		$control->setSelectedValue(empty($value) ? $current : $value);
 		$control->setCssClass('year-dropdown');
@@ -169,9 +173,13 @@ 
 	{
 		$value = $this->getRecordPropertyValue($column, $record);
 		$hours = [];
-		for($i = 0;$i < 24;$i++) $hours[] = str_pad($i, 2, '0', STR_PAD_LEFT);
+		for($i = 0;$i < 24;$i++) {
+			$hours[] = str_pad($i, 2, '0', STR_PAD_LEFT);
+		}
 		$mins = [];
-		for($i = 0;$i < 60;$i++) $mins[] = str_pad($i, 2, '0', STR_PAD_LEFT);
+		for($i = 0;$i < 60;$i++) {
+			$mins[] = str_pad($i, 2, '0', STR_PAD_LEFT);
+		}
 		$hour = intval(@date('H'));
 		$min = intval(@date('i'));
 		$sec = intval(@date('s'));
@@ -182,8 +190,9 @@ 
 			{
 				$hour = $match[1];
 				$min = $match[2];
-				if(isset($match[3]))
-					$sec = $match[3];
+				if(isset($match[3])) {
+									$sec = $match[3];
+				}
 			}
 		}
 
@@ -221,8 +230,9 @@ 
 		$control->setFromYear(1900);
 		$control->setInputMode(TDatePickerInputMode::DropDownList);
 		$control->setDateFormat('yyyy-MM-dd');
-		if(!empty($value))
-			$control->setDate(substr($value, 0, 10));
+		if(!empty($value)) {
+					$control->setDate(substr($value, 0, 10));
+		}
 		$control->setCssClass('date-dropdown');
 		$this->setNotNullProperty($container, $control, $column, $record);
 		return $control;
@@ -241,8 +251,9 @@ 
 			{
 				$time[0]->setSelectedValue(intval($match[1]));
 				$time[1]->setSelectedValue(intval($match[2]));
-				if(isset($match[3]))
-					$time[2]->setSelectedValue(intval($match[3]));
+				if(isset($match[3])) {
+									$time[2]->setSelectedValue(intval($match[3]));
+				}
 			}
 		}
 		$time[0]->setID('scaffold_time_hour');
@@ -286,8 +297,9 @@ 
 		$index = [];
 		for($i = 0, $k = count($checks); $i < $k; $i++)
 		{
-			if(in_array($checks[$i], $values))
-				$index[] = $i;
+			if(in_array($checks[$i], $values)) {
+							$index[] = $i;
+			}
 		}
 		return $index;
 	}
@@ -301,8 +313,9 @@ 
 		$control->setDataSource($values);
 		$control->dataBind();
 		$index = $this->getMatchingIndices($values, $selectedValues);
-		if(count($index) > 0)
-			$control->setSelectedIndex($index[0]);
+		if(count($index) > 0) {
+					$control->setSelectedIndex($index[0]);
+		}
 		$control->setID(self::DEFAULT_ID);
 		$control->setCssClass('enum-radio-buttons');
 		$this->setNotNullProperty($container, $control, $column, $record);
@@ -314,8 +327,9 @@ 
 		$value = [];
 		foreach($container->findControl(self::DEFAULT_ID)->getItems() as $item)
 		{
-			if($item->getSelected())
-				$value[] = $item->getText();
+			if($item->getSelected()) {
+							$value[] = $item->getText();
+			}
 		}
 		return implode(',', $value);
 	}

framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php

Spacing +10 added lines, -10 removed lines

@@ -27,24 +27,24 @@ 
 	{
 		$record->getDbConnection()->setActive(true); //must be connected before retrieving driver name!
 		$driver = $record->getDbConnection()->getDriverName();
-		switch(strtolower($driver))
+		switch (strtolower($driver))
 		{
 			case 'sqlite': //sqlite 3
 			case 'sqlite2': //sqlite 2
-				require_once(dirname(__FILE__) . '/TSqliteScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TSqliteScaffoldInput.php');
 				return new TSqliteScaffoldInput($conn);
 			case 'mysqli':
 			case 'mysql':
-				require_once(dirname(__FILE__) . '/TMysqlScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TMysqlScaffoldInput.php');
 				return new TMysqlScaffoldInput($conn);
 			case 'pgsql':
-				require_once(dirname(__FILE__) . '/TPgsqlScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TPgsqlScaffoldInput.php');
 				return new TPgsqlScaffoldInput($conn);
 			case 'mssql':
-				require_once(dirname(__FILE__) . '/TMssqlScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TMssqlScaffoldInput.php');
 				return new TMssqlScaffoldInput($conn);
 			case 'ibm':
-				require_once(dirname(__FILE__) . '/TIbmScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TIbmScaffoldInput.php');
 				return new TIbmScaffoldInput($conn);
 			default:
 				throw new TConfigurationException(
@@ -57,13 +57,13 @@ 
 		$this->_parent = $parent;
 		$item->setCustomData($column->getColumnId());
 		$this->createControl($item->_input, $column, $record);
-		if($item->_input->findControl(self::DEFAULT_ID))
+		if ($item->_input->findControl(self::DEFAULT_ID))
 			$this->createControlLabel($item->_label, $column, $record);
 	}
 
 	protected function createControlLabel($label, $column, $record)
 	{
-		$fieldname = ucwords(str_replace('_', ' ', $column->getColumnId())) . ':';
+		$fieldname = ucwords(str_replace('_', ' ', $column->getColumnId())).':';
 		$label->setText($fieldname);
 		$label->setForControl(self::DEFAULT_ID);
 	}
@@ -71,7 +71,7 @@ 
 	public function loadScaffoldInput($parent, $item, $column, $record)
 	{
 		$this->_parent = $parent;
-		if($this->getIsEnabled($column, $record))
+		if ($this->getIsEnabled($column, $record))
 		{
 			$prop = $column->getColumnId();
 			$record->setColumnValue($prop, $this->getControlValue($item->_input, $column, $record));
@@ -87,7 +87,7 @@ 
 	protected function getRecordPropertyValue($column, $record)
 	{
 		$value = $record->getColumnValue($column->getColumnId());
-		if($column->getDefaultValue() !== TDbTableColumn::UNDEFINED_VALUE && $value === null)
+		if ($column->getDefaultValue() !== TDbTableColumn::UNDEFINED_VALUE && $value === null)
 			return $column->getDefaultValue();
 		else
 			return $value;

Braces +8 added lines, -6 removed lines

@@ -57,8 +57,9 @@ 
 		$this->_parent = $parent;
 		$item->setCustomData($column->getColumnId());
 		$this->createControl($item->_input, $column, $record);
-		if($item->_input->findControl(self::DEFAULT_ID))
-			$this->createControlLabel($item->_label, $column, $record);
+		if($item->_input->findControl(self::DEFAULT_ID)) {
+					$this->createControlLabel($item->_label, $column, $record);
+		}
 	}
 
 	protected function createControlLabel($label, $column, $record)
@@ -87,10 +88,11 @@ 
 	protected function getRecordPropertyValue($column, $record)
 	{
 		$value = $record->getColumnValue($column->getColumnId());
-		if($column->getDefaultValue() !== TDbTableColumn::UNDEFINED_VALUE && $value === null)
-			return $column->getDefaultValue();
-		else
-			return $value;
+		if($column->getDefaultValue() !== TDbTableColumn::UNDEFINED_VALUE && $value === null) {
+					return $column->getDefaultValue();
+		} else {
+					return $value;
+		}
 	}
 
 	protected function setRecordPropertyValue($item, $record, $input)

framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 {
 	protected function createControl($container, $column, $record)
 	{
-		switch(strtolower($column->getDbType()))
+		switch (strtolower($column->getDbType()))
 		{
 			case 'bit':
 				return $this->createBooleanControl($container, $column, $record);
@@ -31,7 +31,7 @@ 
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
 				$control = $this->createDefaultControl($container, $column, $record);
-				if($column->getIsExcluded())
+				if ($column->getIsExcluded())
 					$control->setEnabled(false);
 				return $control;
 		}
@@ -39,7 +39,7 @@ 
 
 	protected function getControlValue($container, $column, $record)
 	{
-		switch(strtolower($column->getDbType()))
+		switch (strtolower($column->getDbType()))
 		{
 			case 'boolean':
 				return $container->findControl(self::DEFAULT_ID)->getChecked();
@@ -47,7 +47,7 @@ 
 				return $this->getDateTimeValue($container, $column, $record);
 			default:
 				$value = $this->getDefaultControlValue($container, $column, $record);
-				if(trim($value) === '' && $column->getAllowNull())
+				if (trim($value) === '' && $column->getAllowNull())
 					return null;
 				else
 					return $value;

Braces +8 added lines, -6 removed lines

@@ -31,8 +31,9 @@ 
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
 				$control = $this->createDefaultControl($container, $column, $record);
-				if($column->getIsExcluded())
-					$control->setEnabled(false);
+				if($column->getIsExcluded()) {
+									$control->setEnabled(false);
+				}
 				return $control;
 		}
 	}
@@ -47,10 +48,11 @@ 
 				return $this->getDateTimeValue($container, $column, $record);
 			default:
 				$value = $this->getDefaultControlValue($container, $column, $record);
-				if(trim($value) === '' && $column->getAllowNull())
-					return null;
-				else
-					return $value;
+				if(trim($value) === '' && $column->getAllowNull()) {
+									return null;
+				} else {
+									return $value;
+				}
 		}
 	}
 }

framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php

Spacing +13 added lines, -13 removed lines

@@ -64,7 +64,7 @@ 
 	 */
 	public function onLoad($param)
 	{
-		if($this->getVisible())
+		if ($this->getVisible())
 			$this->initializeEditForm();
 	}
 
@@ -117,7 +117,7 @@ 
 	{
 		$record = $this->getCurrentRecord();
 		$classPath = $this->getEditRenderer();
-		if($classPath === '')
+		if ($classPath === '')
 		{
 			$columns = $this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
@@ -125,7 +125,7 @@ 
 		}
 		else
 		{
-			if($this->_editRenderer === null)
+			if ($this->_editRenderer === null)
 				$this->createEditRenderer($record, $classPath);
 			else
 				$this->_editRenderer->setData($record);
@@ -142,7 +142,7 @@ 
 	protected function createEditRenderer($record, $classPath)
 	{
 		$this->_editRenderer = Prado::createComponent($classPath);
-		if($this->_editRenderer instanceof IScaffoldEditRenderer)
+		if ($this->_editRenderer instanceof IScaffoldEditRenderer)
 		{
 			$index = $this->getControls()->remove($this->getInputRepeater());
 			$this->getControls()->insertAt($index, $this->_editRenderer);
@@ -161,11 +161,11 @@ 
 	protected function createRepeaterEditItem($sender, $param)
 	{
 		$type = $param->getItem()->getItemType();
-		if($type == TListItemType::Item || $type == TListItemType::AlternatingItem)
+		if ($type == TListItemType::Item || $type == TListItemType::AlternatingItem)
 		{
 			$item = $param->getItem();
 			$column = $item->getData();
-			if($column === null)
+			if ($column === null)
 				return;
 
 			$record = $this->getCurrentRecord();
@@ -180,7 +180,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		switch(strtolower($param->getCommandName()))
+		switch (strtolower($param->getCommandName()))
 		{
 			case 'save':
 				return $this->doSave() ? false : true;
@@ -199,14 +199,14 @@ 
 	 */
 	protected function doSave()
 	{
-		if($this->getPage()->getIsValid())
+		if ($this->getPage()->getIsValid())
 		{
 			$record = $this->getCurrentRecord();
-			if($this->_editRenderer === null)
+			if ($this->_editRenderer === null)
 			{
 				$table = $this->getTableInfo();
 				$builder = $this->getScaffoldInputBuilder($record);
-				foreach($this->getInputRepeater()->getItems() as $item)
+				foreach ($this->getInputRepeater()->getItems() as $item)
 				{
 					$column = $table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
@@ -219,7 +219,7 @@ 
 			$record->save();
 			return true;
 		}
-		elseif($this->_editRenderer !== null)
+		elseif ($this->_editRenderer !== null)
 		{
 			//preserve the form data.
 			$this->_editRenderer->updateRecord($this->getCurrentRecord());
@@ -273,7 +273,7 @@ 
 	{
 		static $_builders = [];
 		$class = get_class($record);
-		if(!isset($_builders[$class]))
+		if (!isset($_builders[$class]))
 		{
 			$_builders[$class] = TScaffoldInputBase::createInputBuilder($record);
 		}
@@ -285,6 +285,6 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return 'group_' . $this->getUniqueID();
+		return 'group_'.$this->getUniqueID();
 	}
 }
\ No newline at end of file

Braces +15 added lines, -16 removed lines

@@ -64,8 +64,9 @@ 
 	 */
 	public function onLoad($param)
 	{
-		if($this->getVisible())
-			$this->initializeEditForm();
+		if($this->getVisible()) {
+					$this->initializeEditForm();
+		}
 	}
 
 	/**
@@ -122,13 +123,13 @@ 
 			$columns = $this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
 			$this->getInputRepeater()->dataBind();
-		}
-		else
+		} else
 		{
-			if($this->_editRenderer === null)
-				$this->createEditRenderer($record, $classPath);
-			else
-				$this->_editRenderer->setData($record);
+			if($this->_editRenderer === null) {
+							$this->createEditRenderer($record, $classPath);
+			} else {
+							$this->_editRenderer->setData($record);
+			}
 		}
 	}
 
@@ -147,8 +148,7 @@ 
 			$index = $this->getControls()->remove($this->getInputRepeater());
 			$this->getControls()->insertAt($index, $this->_editRenderer);
 			$this->_editRenderer->setData($record);
-		}
-		else
+		} else
 		{
 			throw new TConfigurationException(
 				'scaffold_invalid_edit_renderer', $this->getID(), get_class($record));
@@ -165,8 +165,9 @@ 
 		{
 			$item = $param->getItem();
 			$column = $item->getData();
-			if($column === null)
-				return;
+			if($column === null) {
+							return;
+			}
 
 			$record = $this->getCurrentRecord();
 			$builder = $this->getScaffoldInputBuilder($record);
@@ -211,15 +212,13 @@ 
 					$column = $table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
 				}
-			}
-			else
+			} else
 			{
 				$this->_editRenderer->updateRecord($record);
 			}
 			$record->save();
 			return true;
-		}
-		elseif($this->_editRenderer !== null)
+		} elseif($this->_editRenderer !== null)
 		{
 			//preserve the form data.
 			$this->_editRenderer->updateRecord($this->getCurrentRecord());

framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php

Spacing +6 added lines, -6 removed lines

@@ -47,10 +47,10 @@ 
 	 */
 	protected function getListView()
 	{
-		if($this->_list === null && ($id = $this->getListViewID()) !== null)
+		if ($this->_list === null && ($id = $this->getListViewID()) !== null)
 		{
 			$this->_list = $this->getParent()->findControl($id);
-			if($this->_list === null)
+			if ($this->_list === null)
 				throw new TConfigurationException('scaffold_unable_to_find_list_view', $id);
 		}
 		return $this->_list;
@@ -78,9 +78,9 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if(strtolower($param->getCommandName()) === 'search')
+		if (strtolower($param->getCommandName()) === 'search')
 		{
-			if(($list = $this->getListView()) !== null)
+			if (($list = $this->getListView()) !== null)
 			{
 				$list->setSearchCondition($this->createSearchCondition());
 				return false;
@@ -96,7 +96,7 @@ 
 	protected function createSearchCondition()
 	{
 		$table = $this->getTableInfo();
-		if(strlen($str = $this->getSearchText()->getText()) > 0)
+		if (strlen($str = $this->getSearchText()->getText()) > 0)
 		{
 			$builder = $table->createCommandBuilder($this->getRecordFinder()->getDbConnection());
 			return $builder->getSearchExpression($this->getFields(), $str);
@@ -108,7 +108,7 @@ 
 	 */
 	protected function getFields()
 	{
-		if(strlen(trim($str = $this->getSearchableFields())) > 0)
+		if (strlen(trim($str = $this->getSearchableFields())) > 0)
 			$fields = preg_split('/\s*,\s*/', $str);
 		else
 			$fields = $this->getTableInfo()->getColumns()->getKeys();

Braces +8 added lines, -6 removed lines

@@ -50,8 +50,9 @@ 
 		if($this->_list === null && ($id = $this->getListViewID()) !== null)
 		{
 			$this->_list = $this->getParent()->findControl($id);
-			if($this->_list === null)
-				throw new TConfigurationException('scaffold_unable_to_find_list_view', $id);
+			if($this->_list === null) {
+							throw new TConfigurationException('scaffold_unable_to_find_list_view', $id);
+			}
 		}
 		return $this->_list;
 	}
@@ -108,10 +109,11 @@ 
 	 */
 	protected function getFields()
 	{
-		if(strlen(trim($str = $this->getSearchableFields())) > 0)
-			$fields = preg_split('/\s*,\s*/', $str);
-		else
-			$fields = $this->getTableInfo()->getColumns()->getKeys();
+		if(strlen(trim($str = $this->getSearchableFields())) > 0) {
+					$fields = preg_split('/\s*,\s*/', $str);
+		} else {
+					$fields = $this->getTableInfo()->getColumns()->getKeys();
+		}
 		return $fields;
 	}
 

framework/Data/ActiveRecord/TActiveRecordManager.php

Spacing +4 added lines, -4 removed lines

@@ -96,9 +96,9 @@ 
 	public static function getInstance($self = null)
 	{
 		static $instance;
-		if($self !== null)
+		if ($self !== null)
 			$instance = $self;
-		elseif($instance === null)
+		elseif ($instance === null)
 			$instance = new self;
 		return $instance;
 	}
@@ -108,7 +108,7 @@ 
 	 */
 	public function getRecordGateway()
 	{
-		if($this->_gateway === null) {
+		if ($this->_gateway === null) {
 			$this->_gateway = $this->createRecordGateway();
 		}
 		return $this->_gateway;
@@ -129,7 +129,7 @@ 
 	public function setGatewayClass($value)
 	{
 		$this->_gateway = null;
-		$this->_gatewayClass = (string)$value;
+		$this->_gatewayClass = (string) $value;
 	}
 
 	/**

Braces +5 added lines, -4 removed lines

@@ -96,10 +96,11 @@
 	public static function getInstance($self = null)
 	{
 		static $instance;
-		if($self !== null)
-			$instance = $self;
-		elseif($instance === null)
-			$instance = new self;
+		if($self !== null) {
+					$instance = $self;
+		} elseif($instance === null) {
+					$instance = new self;
+		}
 		return $instance;
 	}