Completed
Push — prado-3.3 ( f4da81...5dd4b5 )
by Fabio
09:03
created
framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -53,15 +53,15 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	protected function initializeSort()
55 55
 	{
56
-		$table = $this->getTableInfo();
57
-		$sorts = array('Sort By', str_repeat('-',15));
58
-		$headers = array();
56
+		$table=$this->getTableInfo();
57
+		$sorts=array('Sort By', str_repeat('-', 15));
58
+		$headers=array();
59 59
 		foreach($table->getColumns() as $name=>$colum)
60 60
 		{
61
-			$fname = ucwords(str_replace('_', ' ', $name));
62
-			$sorts[$name.' ASC'] = $fname .' Ascending';
63
-			$sorts[$name.' DESC'] = $fname .' Descending';
64
-			$headers[] = $fname ;
61
+			$fname=ucwords(str_replace('_', ' ', $name));
62
+			$sorts[$name.' ASC']=$fname.' Ascending';
63
+			$sorts[$name.' DESC']=$fname.' Descending';
64
+			$headers[]=$fname;
65 65
 		}
66 66
 		$this->_sort->setDataSource($sorts);
67 67
 		$this->_sort->dataBind();
@@ -88,10 +88,10 @@  discard block
 block discarded – undo
88 88
 	 */
89 89
 	protected function loadRecordData()
90 90
 	{
91
-		$search = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
91
+		$search=new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
92 92
 		$this->_list->setVirtualItemCount($this->getRecordFinder()->count($search));
93
-		$finder = $this->getRecordFinder();
94
-		$criteria = $this->getRecordCriteria();
93
+		$finder=$this->getRecordFinder();
94
+		$criteria=$this->getRecordCriteria();
95 95
 		$this->_list->setDataSource($finder->findAll($criteria));
96 96
 		$this->_list->dataBind();
97 97
 	}
@@ -101,21 +101,21 @@  discard block
 block discarded – undo
101 101
 	 */
102 102
 	protected function getRecordCriteria()
103 103
 	{
104
-		$total = $this->_list->getVirtualItemCount();
105
-		$limit = $this->_list->getPageSize();
106
-		$offset = $this->_list->getCurrentPageIndex()*$limit;
104
+		$total=$this->_list->getVirtualItemCount();
105
+		$limit=$this->_list->getPageSize();
106
+		$offset=$this->_list->getCurrentPageIndex() * $limit;
107 107
 		if($offset + $limit > $total)
108
-			$limit = $total - $offset;
109
-		$criteria = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
108
+			$limit=$total - $offset;
109
+		$criteria=new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
110 110
 		if($limit > 0)
111 111
 		{
112 112
 			$criteria->setLimit($limit);
113 113
 			if($offset <= $total)
114 114
 				$criteria->setOffset($offset);
115 115
 		}
116
-		$order = explode(' ',$this->_sort->getSelectedValue(), 2);
117
-		if(is_array($order) && count($order) === 2)
118
-			$criteria->OrdersBy[$order[0]] = $order[1];
116
+		$order=explode(' ', $this->_sort->getSelectedValue(), 2);
117
+		if(is_array($order) && count($order)===2)
118
+			$criteria->OrdersBy[$order[0]]=$order[1];
119 119
 		return $criteria;
120 120
 	}
121 121
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	 */
141 141
 	public function setSearchParameters($value)
142 142
 	{
143
-		$this->setViewState('SearchParameters', TPropertyValue::ensureArray($value),array());
143
+		$this->setViewState('SearchParameters', TPropertyValue::ensureArray($value), array());
144 144
 	}
145 145
 
146 146
 	/**
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 		{
177 177
 			if($param instanceof TRepeaterCommandEventParameter)
178 178
 			{
179
-				$pk = $param->getItem()->getCustomData();
179
+				$pk=$param->getItem()->getCustomData();
180 180
 				$ctrl->setRecordPk($pk);
181 181
 				$ctrl->initializeEditForm();
182 182
 			}
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 	{
191 191
 		if($param instanceof TRepeaterCommandEventParameter)
192 192
 		{
193
-			$pk = $param->getItem()->getCustomData();
193
+			$pk=$param->getItem()->getCustomData();
194 194
 			$this->getRecordFinder()->deleteByPk($pk);
195 195
 		}
196 196
 	}
@@ -200,10 +200,10 @@  discard block
 block discarded – undo
200 200
 	 */
201 201
 	protected function listItemCreated($sender, $param)
202 202
 	{
203
-		$item = $param->getItem();
203
+		$item=$param->getItem();
204 204
 		if($item instanceof IItemDataRenderer)
205 205
 		{
206
-			$type = $item->getItemType();
206
+			$type=$item->getItemType();
207 207
 			if($type==TListItemType::Item || $type==TListItemType::AlternatingItem)
208 208
 				$this->populateField($sender, $param);
209 209
 		}
@@ -215,11 +215,11 @@  discard block
 block discarded – undo
215 215
 	 */
216 216
 	protected function populateField($sender, $param)
217 217
 	{
218
-		$item = $param->getItem();
219
-		if(($data = $item->getData()) !== null)
218
+		$item=$param->getItem();
219
+		if(($data=$item->getData())!==null)
220 220
 		{
221 221
 			$item->setCustomData($this->getRecordPkValues($data));
222
-			if(($prop = $item->findControl('_properties'))!==null)
222
+			if(($prop=$item->findControl('_properties'))!==null)
223 223
 			{
224 224
 				$item->_properties->setDataSource($this->getRecordPropertyValues($data));
225 225
 				$item->_properties->dataBind();
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 	{
295 295
 		if(($id=$this->getEditViewID())!==null)
296 296
 		{
297
-			$ctrl = $this->getParent()->findControl($id);
297
+			$ctrl=$this->getParent()->findControl($id);
298 298
 			if($ctrl===null)
299 299
 				throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
300 300
 			return $ctrl;
Please login to merge, or discard this patch.
framework/Data/ActiveRecord/Scaffold/TScaffoldView.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 	 * Handle the "edit" and "new" commands by displaying the edit view.
91 91
 	 * Default command shows the list view.
92 92
 	 */
93
-	public function bubbleEvent($sender,$param)
93
+	public function bubbleEvent($sender, $param)
94 94
 	{
95 95
 		switch(strtolower($param->getCommandName()))
96 96
 		{
Please login to merge, or discard this patch.
framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 			case 'char': case 'varchar':
30 30
 				return $this->createMultiLineControl($container, $column, $record);
31 31
 			default:
32
-				return $this->createDefaultControl($container,$column, $record);
32
+				return $this->createDefaultControl($container, $column, $record);
33 33
 		}
34 34
 	}
35 35
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 			case 'timestamp':
45 45
 				return $this->getDateTimeValue($container, $column, $record);
46 46
 			default:
47
-				return $this->getDefaultControlValue($container,$column, $record);
47
+				return $this->getDefaultControlValue($container, $column, $record);
48 48
 		}
49 49
 	}
50 50
 }
Please login to merge, or discard this patch.
framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			case 'datetime': case 'smalldatetime':
27 27
 				return $this->createDateTimeControl($container, $column, $record);
28 28
 			default:
29
-				$control = $this->createDefaultControl($container,$column, $record);
29
+				$control=$this->createDefaultControl($container, $column, $record);
30 30
 				if($column->getIsExcluded())
31 31
 					$control->setEnabled(false);
32 32
 				return $control;
@@ -40,9 +40,9 @@  discard block
 block discarded – undo
40 40
 			case 'boolean':
41 41
 				return $container->findControl(self::DEFAULT_ID)->getChecked();
42 42
 			case 'datetime': case 'smalldatetime':
43
-				return $this->getDateTimeValue($container,$column, $record);
43
+				return $this->getDateTimeValue($container, $column, $record);
44 44
 			default:
45
-				$value = $this->getDefaultControlValue($container,$column, $record);
45
+				$value=$this->getDefaultControlValue($container, $column, $record);
46 46
 				if(trim($value)==='' && $column->getAllowNull())
47 47
 					return null;
48 48
 				else
Please login to merge, or discard this patch.
framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 			case 'datetime': case 'timestamp':
34 34
 				return $this->createDateTimeControl($container, $column, $record);
35 35
 			default:
36
-				return $this->createDefaultControl($container,$column, $record);
36
+				return $this->createDefaultControl($container, $column, $record);
37 37
 		}
38 38
 	}
39 39
 
@@ -50,16 +50,16 @@  discard block
 block discarded – undo
50 50
 			case 'time':
51 51
 				return $this->getTimeValue($container, $column, $record);
52 52
 			case 'datetime': case 'timestamp':
53
-				return $this->getDateTimeValue($container,$column, $record);
53
+				return $this->getDateTimeValue($container, $column, $record);
54 54
 			default:
55
-				return $this->getDefaultControlValue($container,$column, $record);
55
+				return $this->getDefaultControlValue($container, $column, $record);
56 56
 		}
57 57
 	}
58 58
 
59 59
 	protected function createDateControl($container, $column, $record)
60 60
 	{
61
-		$control = parent::createDateControl($container, $column, $record);
62
-		$value = $this->getRecordPropertyValue($column, $record);
61
+		$control=parent::createDateControl($container, $column, $record);
62
+		$value=$this->getRecordPropertyValue($column, $record);
63 63
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
64 64
 			$control->setTimestamp(intval($value));
65 65
 		return $control;
@@ -67,12 +67,12 @@  discard block
 block discarded – undo
67 67
 
68 68
 	protected function createDateTimeControl($container, $column, $record)
69 69
 	{
70
-		$value = $this->getRecordPropertyValue($column, $record);
71
-		$time = parent::createDateTimeControl($container, $column, $record);
70
+		$value=$this->getRecordPropertyValue($column, $record);
71
+		$time=parent::createDateTimeControl($container, $column, $record);
72 72
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
73 73
 		{
74
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
75
-			$date = $s->getDate(intval($value));
74
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
75
+			$date=$s->getDate(intval($value));
76 76
 			$time[1]->setSelectedValue($date['hours']);
77 77
 			$time[2]->setSelectedValue($date['minutes']);
78 78
 			$time[3]->setSelectedValue($date['seconds']);
@@ -84,13 +84,13 @@  discard block
 block discarded – undo
84 84
 	{
85 85
 		if(preg_match('/timestamp/i', $column->getDbType()))
86 86
 		{
87
-			$time = $container->findControl(self::DEFAULT_ID)->getTimestamp();
88
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
89
-			$date = $s->getDate($time);
90
-			$hour = $container->findControl('scaffold_time_hour')->getSelectedValue();
91
-			$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
92
-			$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
93
-			return $s->getTimeStamp($hour,$mins,$secs,$date['mon'],$date['mday'],$date['year']);
87
+			$time=$container->findControl(self::DEFAULT_ID)->getTimestamp();
88
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
89
+			$date=$s->getDate($time);
90
+			$hour=$container->findControl('scaffold_time_hour')->getSelectedValue();
91
+			$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
92
+			$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
93
+			return $s->getTimeStamp($hour, $mins, $secs, $date['mon'], $date['mday'], $date['year']);
94 94
 		}
95 95
 		else
96 96
 			return parent::getDateTimeValue($container, $column, $record);
Please login to merge, or discard this patch.
framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  */
10 10
 class TScaffoldInputBase
11 11
 {
12
-	const DEFAULT_ID = 'scaffold_input';
12
+	const DEFAULT_ID='scaffold_input';
13 13
 	private $_parent;
14 14
 
15 15
 	protected function getParent()
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 	public static function createInputBuilder($record)
21 21
 	{
22 22
 		$record->getDbConnection()->setActive(true); //must be connected before retrieving driver name!
23
-		$driver = $record->getDbConnection()->getDriverName();
23
+		$driver=$record->getDbConnection()->getDriverName();
24 24
 		switch(strtolower($driver))
25 25
 		{
26 26
 			case 'sqlite': //sqlite 3
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 				return new TIbmScaffoldInput($conn);
43 43
 			default:
44 44
 				throw new TConfigurationException(
45
-					'scaffold_invalid_database_driver',$driver);
45
+					'scaffold_invalid_database_driver', $driver);
46 46
 		}
47 47
 	}
48 48
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
 	protected function createControlLabel($label, $column, $record)
59 59
 	{
60
-		$fieldname = ucwords(str_replace('_', ' ', $column->getColumnId())).':';
60
+		$fieldname=ucwords(str_replace('_', ' ', $column->getColumnId())).':';
61 61
 		$label->setText($fieldname);
62 62
 		$label->setForControl(self::DEFAULT_ID);
63 63
 	}
@@ -67,20 +67,20 @@  discard block
 block discarded – undo
67 67
 		$this->_parent=$parent;
68 68
 		if($this->getIsEnabled($column, $record))
69 69
 		{
70
-			$prop = $column->getColumnId();
70
+			$prop=$column->getColumnId();
71 71
 			$record->setColumnValue($prop, $this->getControlValue($item->_input, $column, $record));
72 72
 		}
73 73
 	}
74 74
 
75 75
 	protected function getIsEnabled($column, $record)
76 76
 	{
77
-		return !($this->getParent()->getRecordPk() !== null
77
+		return !($this->getParent()->getRecordPk()!==null
78 78
 				&& $column->getIsPrimaryKey() || $column->hasSequence());
79 79
 	}
80 80
 
81 81
 	protected function getRecordPropertyValue($column, $record)
82 82
 	{
83
-		$value = $record->getColumnValue($column->getColumnId());
83
+		$value=$record->getColumnValue($column->getColumnId());
84 84
 		if($column->getDefaultValue()!==TDbTableColumn::UNDEFINED_VALUE && $value===null)
85 85
 			return $column->getDefaultValue();
86 86
 		else
Please login to merge, or discard this patch.
framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 			case 'timestamp without time zone':
31 31
 				return $this->createDateTimeControl($container, $column, $record);
32 32
 			default:
33
-				return $this->createDefaultControl($container,$column, $record);
33
+				return $this->createDefaultControl($container, $column, $record);
34 34
 		}
35 35
 	}
36 36
 
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 			case 'time without time zone':
46 46
 				return $this->getTimeValue($container, $column, $record);
47 47
 			case 'timestamp without time zone':
48
-				return $this->getDateTimeValue($container,$column, $record);
48
+				return $this->getDateTimeValue($container, $column, $record);
49 49
 			default:
50
-				return $this->getDefaultControlValue($container,$column, $record);
50
+				return $this->getDefaultControlValue($container, $column, $record);
51 51
 		}
52 52
 	}
53 53
 }
Please login to merge, or discard this patch.
framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 	{
16 16
 		$control->setID(self::DEFAULT_ID);
17 17
 		$control->setEnabled($this->getIsEnabled($column, $record));
18
-		$container->Controls[] = $control;
18
+		$container->Controls[]=$control;
19 19
 	}
20 20
 
21 21
 	protected function setNotNullProperty($container, $control, $column, $record)
@@ -27,8 +27,8 @@  discard block
 block discarded – undo
27 27
 
28 28
 	protected function createBooleanControl($container, $column, $record)
29 29
 	{
30
-		$value = $this->getRecordPropertyValue($column, $record);
31
-		$control = new TCheckBox();
30
+		$value=$this->getRecordPropertyValue($column, $record);
31
+		$control=new TCheckBox();
32 32
 		$control->setChecked(TPropertyValue::ensureBoolean($value));
33 33
 		$control->setCssClass('boolean-checkbox');
34 34
 		$this->setDefaultProperty($container, $control, $column, $record);
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 
38 38
 	protected function createDefaultControl($container, $column, $record)
39 39
 	{
40
-		$value = $this->getRecordPropertyValue($column, $record);
41
-		$control = new TTextBox();
40
+		$value=$this->getRecordPropertyValue($column, $record);
41
+		$control=new TTextBox();
42 42
 		$control->setText($value);
43 43
 		$control->setCssClass('default-textbox scaffold_input');
44 44
 		if(($len=$column->getColumnSize())!==null)
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
 		return $control;
48 48
 	}
49 49
 
50
-	protected function getDefaultControlValue($container,$column, $record)
50
+	protected function getDefaultControlValue($container, $column, $record)
51 51
 	{
52
-		$control = $container->findControl(self::DEFAULT_ID);
52
+		$control=$container->findControl(self::DEFAULT_ID);
53 53
 		if($control instanceof TCheckBox)
54 54
 			return $control->getChecked();
55 55
 		else if($control instanceof TControl)
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
 
59 59
 	protected function createMultiLineControl($container, $column, $record)
60 60
 	{
61
-		$value = $this->getRecordPropertyValue($column, $record);
62
-		$control = new TTextBox();
61
+		$value=$this->getRecordPropertyValue($column, $record);
62
+		$control=new TTextBox();
63 63
 		$control->setText($value);
64 64
 		$control->setTextMode(TTextBoxMode::MultiLine);
65 65
 		$control->setCssClass('multiline-textbox scaffold_input');
@@ -69,13 +69,13 @@  discard block
 block discarded – undo
69 69
 
70 70
 	protected function createYearControl($container, $column, $record)
71 71
 	{
72
-		$value = $this->getRecordPropertyValue($column, $record);
73
-		$control = new TDropDownList();
74
-		$years = array();
75
-		$current = intval(@date('Y'));
76
-		$from = $current-10; $to=$current+10;
77
-		for($i = $from; $i <= $to; $i++)
78
-			$years[$i] = $i;
72
+		$value=$this->getRecordPropertyValue($column, $record);
73
+		$control=new TDropDownList();
74
+		$years=array();
75
+		$current=intval(@date('Y'));
76
+		$from=$current - 10; $to=$current + 10;
77
+		for($i=$from; $i <= $to; $i++)
78
+			$years[$i]=$i;
79 79
 		$control->setDataSource($years);
80 80
 		$control->setSelectedValue(empty($value) ? $current : $value);
81 81
 		$control->setCssClass('year-dropdown');
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 
86 86
 	protected function createIntegerControl($container, $column, $record)
87 87
 	{
88
-		$control = $this->createDefaultControl($container, $column, $record);
89
-		$val = $this->createTypeValidator($container, $column, $record);
88
+		$control=$this->createDefaultControl($container, $column, $record);
89
+		$val=$this->createTypeValidator($container, $column, $record);
90 90
 		$val->setDataType(TValidationDataType::Integer);
91 91
 		$val->setErrorMessage('Please entery an integer.');
92 92
 		return $control;
@@ -94,13 +94,13 @@  discard block
 block discarded – undo
94 94
 
95 95
 	protected function createFloatControl($container, $column, $record)
96 96
 	{
97
-		$control = $this->createDefaultControl($container, $column, $record);
98
-		$val = $this->createTypeValidator($container, $column, $record);
97
+		$control=$this->createDefaultControl($container, $column, $record);
98
+		$val=$this->createTypeValidator($container, $column, $record);
99 99
 		$val->setDataType(TValidationDataType::Float);
100 100
 		$val->setErrorMessage('Please entery a decimal number.');
101
-		if(($max= $column->getMaxiumNumericConstraint())!==null)
101
+		if(($max=$column->getMaxiumNumericConstraint())!==null)
102 102
 		{
103
-			$val = $this->createRangeValidator($container,$column,$record);
103
+			$val=$this->createRangeValidator($container, $column, $record);
104 104
 			$val->setDataType(TValidationDataType::Float);
105 105
 			$val->setMaxValue($max);
106 106
 			$val->setStrictComparison(true);
@@ -111,99 +111,99 @@  discard block
 block discarded – undo
111 111
 
112 112
 	protected function createRequiredValidator($container, $column, $record)
113 113
 	{
114
-		$val = new TRequiredFieldValidator();
114
+		$val=new TRequiredFieldValidator();
115 115
 		$val->setErrorMessage('*');
116 116
 		$val->setControlCssClass('required-input');
117 117
 		$val->setCssClass('required');
118 118
 		$val->setControlToValidate(self::DEFAULT_ID);
119 119
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
120 120
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
121
-		$container->Controls[] = $val;
121
+		$container->Controls[]=$val;
122 122
 		return $val;
123 123
 	}
124 124
 
125 125
 	protected function createTypeValidator($container, $column, $record)
126 126
 	{
127
-		$val = new TDataTypeValidator();
127
+		$val=new TDataTypeValidator();
128 128
 		$val->setControlCssClass('required-input2');
129 129
 		$val->setCssClass('required');
130 130
 		$val->setControlToValidate(self::DEFAULT_ID);
131 131
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
132 132
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
133
-		$container->Controls[] = $val;
133
+		$container->Controls[]=$val;
134 134
 		return $val;
135 135
 	}
136 136
 
137 137
 	protected function createRangeValidator($container, $column, $record)
138 138
 	{
139
-		$val = new TRangeValidator();
139
+		$val=new TRangeValidator();
140 140
 		$val->setControlCssClass('required-input3');
141 141
 		$val->setCssClass('required');
142 142
 		$val->setControlToValidate(self::DEFAULT_ID);
143 143
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
144 144
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
145
-		$container->Controls[] = $val;
145
+		$container->Controls[]=$val;
146 146
 		return $val;
147 147
 	}
148 148
 
149 149
 	protected function createTimeControl($container, $column, $record)
150 150
 	{
151
-		$value = $this->getRecordPropertyValue($column, $record);
151
+		$value=$this->getRecordPropertyValue($column, $record);
152 152
 		$hours=array();
153
-		for($i=0;$i<24;$i++) $hours[] = str_pad($i,2,'0',STR_PAD_LEFT);
153
+		for($i=0; $i < 24; $i++) $hours[]=str_pad($i, 2, '0', STR_PAD_LEFT);
154 154
 		$mins=array();
155
-		for($i=0;$i<60;$i++) $mins[] = str_pad($i,2,'0',STR_PAD_LEFT);
156
-		$hour = intval(@date('H'));
157
-		$min = intval(@date('i'));
158
-		$sec = intval(@date('s'));
155
+		for($i=0; $i < 60; $i++) $mins[]=str_pad($i, 2, '0', STR_PAD_LEFT);
156
+		$hour=intval(@date('H'));
157
+		$min=intval(@date('i'));
158
+		$sec=intval(@date('s'));
159 159
 		if(!empty($value))
160 160
 		{
161 161
 			$match=array();
162 162
 			if(preg_match('/(\d+):(\d+):?(\d+)?/', $value, $match))
163 163
 			{
164
-				$hour = $match[1];
165
-				$min = $match[2];
164
+				$hour=$match[1];
165
+				$min=$match[2];
166 166
 				if(isset($match[3]))
167 167
 					$sec=$match[3];
168 168
 			}
169 169
 		}
170 170
 
171
-		$hcontrol = new TDropDownList();
171
+		$hcontrol=new TDropDownList();
172 172
 		$hcontrol->setDataSource($hours);
173 173
 		$hcontrol->setID(self::DEFAULT_ID);
174 174
 		$hcontrol->dataBind();
175 175
 		$hcontrol->setSelectedValue(intval($hour));
176
-		$container->Controls[] = $hcontrol;
177
-		$container->Controls[] = ' : ';
176
+		$container->Controls[]=$hcontrol;
177
+		$container->Controls[]=' : ';
178 178
 
179
-		$mcontrol = new TDropDownList();
179
+		$mcontrol=new TDropDownList();
180 180
 		$mcontrol->setDataSource($mins);
181 181
 		$mcontrol->dataBind();
182 182
 		$mcontrol->setID('scaffold_time_min');
183 183
 		$mcontrol->setSelectedValue(intval($min));
184
-		$container->Controls[] = $mcontrol;
185
-		$container->Controls[] = ' : ';
184
+		$container->Controls[]=$mcontrol;
185
+		$container->Controls[]=' : ';
186 186
 
187
-		$scontrol = new TDropDownList();
187
+		$scontrol=new TDropDownList();
188 188
 		$scontrol->setDataSource($mins);
189 189
 		$scontrol->dataBind();
190 190
 		$scontrol->setID('scaffold_time_sec');
191 191
 		$scontrol->setSelectedValue(intval($sec));
192
-		$container->Controls[] = $scontrol;
192
+		$container->Controls[]=$scontrol;
193 193
 
194
-		return array($hcontrol,$mcontrol,$scontrol);
194
+		return array($hcontrol, $mcontrol, $scontrol);
195 195
 	}
196 196
 
197 197
 
198 198
 	protected function createDateControl($container, $column, $record)
199 199
 	{
200
-		$value = $this->getRecordPropertyValue($column, $record);
201
-		$control = new TDatePicker();
200
+		$value=$this->getRecordPropertyValue($column, $record);
201
+		$control=new TDatePicker();
202 202
 		$control->setFromYear(1900);
203 203
 		$control->setInputMode(TDatePickerInputMode::DropDownList);
204 204
 		$control->setDateFormat('yyyy-MM-dd');
205 205
 		if(!empty($value))
206
-			$control->setDate(substr($value,0,10));
206
+			$control->setDate(substr($value, 0, 10));
207 207
 		$control->setCssClass('date-dropdown');
208 208
 		$this->setNotNullProperty($container, $control, $column, $record);
209 209
 		return $control;
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
211 211
 
212 212
 	protected function createDateTimeControl($container, $column, $record)
213 213
 	{
214
-		$value = $this->getRecordPropertyValue($column, $record);
215
-		$control = $this->createDateControl($container, $column, $record);
216
-		$container->Controls[] = ' @ ';
217
-		$time = $this->createTimeControl($container, $column, $record);
214
+		$value=$this->getRecordPropertyValue($column, $record);
215
+		$control=$this->createDateControl($container, $column, $record);
216
+		$container->Controls[]=' @ ';
217
+		$time=$this->createTimeControl($container, $column, $record);
218 218
 		if(!empty($value))
219 219
 		{
220 220
 			$match=array();
@@ -232,30 +232,30 @@  discard block
 block discarded – undo
232 232
 
233 233
 	protected function getDateTimeValue($container, $column, $record)
234 234
 	{
235
-		$date = $container->findControl(self::DEFAULT_ID)->getDate();
236
-		$hour = $container->findControl('scaffold_time_hour')->getSelectedValue();
237
-		$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
238
-		$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
235
+		$date=$container->findControl(self::DEFAULT_ID)->getDate();
236
+		$hour=$container->findControl('scaffold_time_hour')->getSelectedValue();
237
+		$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
238
+		$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
239 239
 		return "{$date} {$hour}:{$mins}:{$secs}";
240 240
 	}
241 241
 
242 242
 	protected function getTimeValue($container, $column, $record)
243 243
 	{
244
-		$hour = $container->findControl(self::DEFAULT_ID)->getSelectedValue();
245
-		$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
246
-		$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
244
+		$hour=$container->findControl(self::DEFAULT_ID)->getSelectedValue();
245
+		$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
246
+		$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
247 247
 		return "{$hour}:{$mins}:{$secs}";
248 248
 	}
249 249
 
250 250
 	protected function createSetControl($container, $column, $record)
251 251
 	{
252
-		$value = $this->getRecordPropertyValue($column, $record);
253
-		$selectedValues = preg_split('/\s*,\s*/', $value);
254
-		$control = new TCheckBoxList();
255
-		$values = $column->getDbTypeValues();
252
+		$value=$this->getRecordPropertyValue($column, $record);
253
+		$selectedValues=preg_split('/\s*,\s*/', $value);
254
+		$control=new TCheckBoxList();
255
+		$values=$column->getDbTypeValues();
256 256
 		$control->setDataSource($values);
257 257
 		$control->dataBind();
258
-		$control->setSelectedIndices($this->getMatchingIndices($values,$selectedValues));
258
+		$control->setSelectedIndices($this->getMatchingIndices($values, $selectedValues));
259 259
 		$control->setID(self::DEFAULT_ID);
260 260
 		$control->setCssClass('set-checkboxes');
261 261
 		$this->setNotNullProperty($container, $control, $column, $record);
@@ -265,23 +265,23 @@  discard block
 block discarded – undo
265 265
 	protected function getMatchingIndices($checks, $values)
266 266
 	{
267 267
 		$index=array();
268
-		for($i=0, $k=count($checks); $i<$k; $i++)
268
+		for($i=0, $k=count($checks); $i < $k; $i++)
269 269
 		{
270 270
 			if(in_array($checks[$i], $values))
271
-				$index[] = $i;
271
+				$index[]=$i;
272 272
 		}
273 273
 		return $index;
274 274
 	}
275 275
 
276 276
 	protected function createEnumControl($container, $column, $record)
277 277
 	{
278
-		$value = $this->getRecordPropertyValue($column, $record);
279
-		$selectedValues = preg_split('/\s*,\s*/', $value);
280
-		$control = new TRadioButtonList();
281
-		$values = $column->getDbTypeValues();
278
+		$value=$this->getRecordPropertyValue($column, $record);
279
+		$selectedValues=preg_split('/\s*,\s*/', $value);
280
+		$control=new TRadioButtonList();
281
+		$values=$column->getDbTypeValues();
282 282
 		$control->setDataSource($values);
283 283
 		$control->dataBind();
284
-		$index = $this->getMatchingIndices($values,$selectedValues);
284
+		$index=$this->getMatchingIndices($values, $selectedValues);
285 285
 		if(count($index) > 0)
286 286
 			$control->setSelectedIndex($index[0]);
287 287
 		$control->setID(self::DEFAULT_ID);
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
 		foreach($container->findControl(self::DEFAULT_ID)->getItems() as $item)
297 297
 		{
298 298
 			if($item->getSelected())
299
-				$value[] = $item->getText();
299
+				$value[]=$item->getText();
300 300
 		}
301 301
 		return implode(',', $value);
302 302
 	}
Please login to merge, or discard this patch.
framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 {
14 14
 	protected function createControl($container, $column, $record)
15 15
 	{
16
-		$dbtype = trim(str_replace(array('unsigned', 'zerofill'),array('','',),strtolower($column->getDbType())));
16
+		$dbtype=trim(str_replace(array('unsigned', 'zerofill'), array('', '',), strtolower($column->getDbType())));
17 17
 		switch($dbtype)
18 18
 		{
19 19
 			case 'date':
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
 	protected function getControlValue($container, $column, $record)
44 44
 	{
45
-		$dbtype = trim(str_replace(array('unsigned', 'zerofill'),array('','',),strtolower($column->getDbType())));
45
+		$dbtype=trim(str_replace(array('unsigned', 'zerofill'), array('', '',), strtolower($column->getDbType())));
46 46
 		switch($dbtype)
47 47
 		{
48 48
 			case 'date':
@@ -52,15 +52,15 @@  discard block
 block discarded – undo
52 52
 			case 'time':
53 53
 				return $this->getTimeValue($container, $column, $record);
54 54
 			case 'datetime': case 'timestamp':
55
-				return $this->getDateTimeValue($container,$column, $record);
55
+				return $this->getDateTimeValue($container, $column, $record);
56 56
 			case 'tinyint':
57
-				return $this->getIntBooleanValue($container,$column, $record);
57
+				return $this->getIntBooleanValue($container, $column, $record);
58 58
 			case 'set':
59 59
 				return $this->getSetValue($container, $column, $record);
60 60
 			case 'enum':
61 61
 				return $this->getEnumValue($container, $column, $record);
62 62
 			default:
63
-				return $this->getDefaultControlValue($container,$column, $record);
63
+				return $this->getDefaultControlValue($container, $column, $record);
64 64
 		}
65 65
 	}
66 66
 
@@ -72,12 +72,12 @@  discard block
 block discarded – undo
72 72
 			parent::createIntegerControl($container, $column, $record);
73 73
 	}
74 74
 
75
-	protected function getIntBooleanValue($container,$column, $record)
75
+	protected function getIntBooleanValue($container, $column, $record)
76 76
 	{
77 77
 		if($column->getColumnSize()==1)
78
-			return (int)$container->findControl(self::DEFAULT_ID)->getChecked();
78
+			return (int) $container->findControl(self::DEFAULT_ID)->getChecked();
79 79
 		else
80
-			return $this->getDefaultControlValue($container,$column, $record);
80
+			return $this->getDefaultControlValue($container, $column, $record);
81 81
 	}
82 82
 }
83 83
 
Please login to merge, or discard this patch.