Completed
Push — master ( 4bf172...5f7aee )
by Jean-Christophe
03:35
created
Ajax/semantic/html/content/table/HtmlTableContent.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
  *
12 12
  */
13 13
 class HtmlTableContent extends HtmlSemCollection {
14
-	protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ];
14
+	protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"];
15 15
 
16 16
 	/**
17 17
 	 *
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 */
35 35
 	public function setRowCount($rowCount, $colCount) {
36 36
 		$count=$this->count();
37
-		for($i=$count; $i < $rowCount; $i++) {
37
+		for ($i=$count; $i<$rowCount; $i++) {
38 38
 			$this->addItem($colCount);
39 39
 		}
40 40
 		return $this;
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		$tr=new HtmlTR("", $value);
57 57
 		$tr->setContainer($this, $count);
58 58
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
59
-		if (isset($value) === true) {
59
+		if (isset($value)===true) {
60 60
 			$tr->setColCount($value);
61 61
 		}
62 62
 		return $tr;
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	public function setCellValue($row, $col, $value="") {
116 116
 		$cell=$this->getCell($row, $col);
117
-		if (isset($cell) === true) {
117
+		if (isset($cell)===true) {
118 118
 			$cell->setValue($value);
119 119
 		}
120 120
 		return $this;
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	 * @param mixed $values
126 126
 	 */
127 127
 	public function setValues($values=array()) {
128
-		return $this->_addOrSetValues($values, function($row,$_values){$row->setValues($_values);});
128
+		return $this->_addOrSetValues($values, function($row, $_values) {$row->setValues($_values); });
129 129
 	}
130 130
 
131 131
 	/**
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 * @param mixed $values
134 134
 	 */
135 135
 	public function addValues($values=array()) {
136
-		return $this->_addOrSetValues($values, function($row,$_values){$row->addValues($_values);});
136
+		return $this->_addOrSetValues($values, function($row, $_values) {$row->addValues($_values); });
137 137
 	}
138 138
 
139 139
 	/**
@@ -141,21 +141,21 @@  discard block
 block discarded – undo
141 141
 	 * @param mixed $values
142 142
 	 * @param callable $callback
143 143
 	 */
144
-	protected function _addOrSetValues($values,$callback) {
144
+	protected function _addOrSetValues($values, $callback) {
145 145
 		$count=$this->count();
146 146
 		$isArray=true;
147 147
 		if (!\is_array($values)) {
148 148
 			$values=\array_fill(0, $count, $values);
149 149
 			$isArray=false;
150 150
 		}
151
-		if (JArray::dimension($values) == 1 && $isArray)
152
-			$values=[ $values ];
151
+		if (JArray::dimension($values)==1 && $isArray)
152
+			$values=[$values];
153 153
 
154 154
 		$count=\min(\sizeof($values), $count);
155 155
 
156
-		for($i=0; $i < $count; $i++) {
156
+		for ($i=0; $i<$count; $i++) {
157 157
 			$row=$this->content[$i];
158
-			$callback($row,$values[$i]);
158
+			$callback($row, $values[$i]);
159 159
 		}
160 160
 		return $this;
161 161
 	}
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 			$values=\array_fill(0, $count, $values);
167 167
 		}
168 168
 		$count=\min(\sizeof($values), $count);
169
-		for($i=0; $i < $count; $i++) {
169
+		for ($i=0; $i<$count; $i++) {
170 170
 			$this->getCell($i, $colIndex)->setValue($values[$i]);
171 171
 		}
172 172
 		return $this;
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 
175 175
 	public function addColVariations($colIndex, $variations=array()) {
176 176
 		$count=$this->count();
177
-		for($i=0; $i < $count; $i++) {
177
+		for ($i=0; $i<$count; $i++) {
178 178
 			$this->getCell($i, $colIndex)->addVariations($variations);
179 179
 		}
180 180
 		return $this;
@@ -191,9 +191,9 @@  discard block
 block discarded – undo
191 191
 
192 192
 	private function colAlign($colIndex, $function) {
193 193
 		$count=$this->count();
194
-		for($i=0; $i < $count; $i++) {
194
+		for ($i=0; $i<$count; $i++) {
195 195
 			$index=$this->content[$i]->getColPosition($colIndex);
196
-			if ($index !== NULL)
196
+			if ($index!==NULL)
197 197
 				$this->getCell($i, $index)->$function();
198 198
 		}
199 199
 		return $this;
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 	 */
226 226
 	public function getColCount() {
227 227
 		$result=0;
228
-		if ($this->count() > 0)
228
+		if ($this->count()>0)
229 229
 			$result=$this->getItem(0)->getColCount();
230 230
 		return $result;
231 231
 	}
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	public function delete($rowIndex, $colIndex=NULL) {
240 240
 		if (isset($colIndex)) {
241 241
 			$row=$this->getItem($rowIndex);
242
-			if (isset($row) === true) {
242
+			if (isset($row)===true) {
243 243
 				$row->delete($colIndex);
244 244
 			}
245 245
 		} else {
@@ -272,17 +272,17 @@  discard block
 block discarded – undo
272 272
 	 */
273 273
 	public function conditionalCellFormat($callback, $format) {
274 274
 		$rows=$this->content;
275
-		foreach ( $rows as $row ) {
275
+		foreach ($rows as $row) {
276 276
 			$row->conditionalCellFormat($callback, $format);
277 277
 		}
278 278
 		return $this;
279 279
 	}
280 280
 
281
-	public function conditionalColFormat($colIndex,$callback,$format){
281
+	public function conditionalColFormat($colIndex, $callback, $format) {
282 282
 		$rows=$this->content;
283
-		foreach ( $rows as $row ) {
283
+		foreach ($rows as $row) {
284 284
 			$cell=$row->getItem($colIndex);
285
-			$cell->conditionnalCellFormat($callback,$format);
285
+			$cell->conditionnalCellFormat($callback, $format);
286 286
 		}
287 287
 		return $this;
288 288
 	}
@@ -294,17 +294,17 @@  discard block
 block discarded – undo
294 294
 	 */
295 295
 	public function conditionalRowFormat($callback, $format) {
296 296
 		$rows=$this->content;
297
-		foreach ( $rows as $row ) {
297
+		foreach ($rows as $row) {
298 298
 			$row->conditionalRowFormat($callback, $format);
299 299
 		}
300 300
 		return $this;
301 301
 	}
302 302
 
303
-	public function hideColumn($colIndex){
303
+	public function hideColumn($colIndex) {
304 304
 		$rows=$this->content;
305
-		foreach ( $rows as $row ) {
305
+		foreach ($rows as $row) {
306 306
 			$cell=$row->getItem($colIndex);
307
-			$cell->addToProperty("style","display:none;");
307
+			$cell->addToProperty("style", "display:none;");
308 308
 		}
309 309
 		return $this;
310 310
 	}
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 	 */
316 316
 	public function applyCells($callback) {
317 317
 		$rows=$this->content;
318
-		foreach ( $rows as $row ) {
318
+		foreach ($rows as $row) {
319 319
 			$row->applyCells($callback);
320 320
 		}
321 321
 		return $this;
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 	 */
328 328
 	public function applyRows($callback) {
329 329
 		$rows=$this->content;
330
-		foreach ( $rows as $row ) {
330
+		foreach ($rows as $row) {
331 331
 			$row->apply($callback);
332 332
 		}
333 333
 		return $this;
Please login to merge, or discard this patch.
Ajax/service/JReflection.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -3,25 +3,25 @@  discard block
 block discarded – undo
3 3
 namespace Ajax\service;
4 4
 
5 5
 class JReflection {
6
-	public static function shortClassName($object){
7
-		$classNameWithNamespace = get_class($object);
6
+	public static function shortClassName($object) {
7
+		$classNameWithNamespace=get_class($object);
8 8
 		return substr($classNameWithNamespace, strrpos($classNameWithNamespace, '\\')+1);
9 9
 	}
10 10
 
11
-	public static function jsonObject($classname){
11
+	public static function jsonObject($classname) {
12 12
 		$object=new $classname();
13
-		$class = new \ReflectionClass($classname);
13
+		$class=new \ReflectionClass($classname);
14 14
 		$methods=$class->getMethods(\ReflectionMethod::IS_PUBLIC);
15
-		foreach ($methods as $method){
15
+		foreach ($methods as $method) {
16 16
 			$name=$method->getName();
17
-			if(JString::startswith($name, "set")){
17
+			if (JString::startswith($name, "set")) {
18 18
 				$property=\lcfirst(JString::replaceAtFirst($name, "set", ""));
19 19
 				$value="__".$property."__";
20
-				try{
21
-					if($class->getProperty($property)!==null){
22
-						\call_user_func_array([$object,$name],[$value]);
20
+				try {
21
+					if ($class->getProperty($property)!==null) {
22
+						\call_user_func_array([$object, $name], [$value]);
23 23
 					}
24
-				}catch(\Exception $e){
24
+				}catch (\Exception $e) {
25 25
 					//Nothing to do
26 26
 				}
27 27
 			}
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 		return $object;
30 30
 	}
31 31
 
32
-	public static function callMethod($object,$callback,array $values){
33
-		return \call_user_func_array([$object,$callback],$values);
32
+	public static function callMethod($object, $callback, array $values) {
33
+		return \call_user_func_array([$object, $callback], $values);
34 34
 	}
35 35
 
36
-	public static function getterName($propertyName,$prefix="get"){
36
+	public static function getterName($propertyName, $prefix="get") {
37 37
 		return $prefix.\ucfirst($propertyName);
38 38
 	}
39 39
 }
40 40
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/base/InstanceViewer.php 1 patch
Spacing   +89 added lines, -89 removed lines patch added patch discarded remove patch
@@ -19,215 +19,215 @@  discard block
 block discarded – undo
19 19
 
20 20
 	public static $index=0;
21 21
 
22
-	public function __construct($identifier,$instance=NULL,$captions=NULL){
22
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
23 23
 		$this->widgetIdentifier=$identifier;
24 24
 		$this->values=[];
25 25
 		$this->afterCompile=[];
26
-		if(isset($instance))
26
+		if (isset($instance))
27 27
 			$this->setInstance($instance);
28 28
 		$this->setCaptions($captions);
29 29
 		$this->captionCallback=NULL;
30
-		$this->defaultValueFunction=function($name,$value){return $value;};
30
+		$this->defaultValueFunction=function($name, $value) {return $value; };
31 31
 	}
32 32
 
33
-	public function moveFieldTo($from,$to){
34
-		if(JArray::moveElementTo($this->visibleProperties, $from, $to)){
33
+	public function moveFieldTo($from, $to) {
34
+		if (JArray::moveElementTo($this->visibleProperties, $from, $to)) {
35 35
 			return JArray::moveElementTo($this->values, $from, $to);
36 36
 		}
37 37
 		return false;
38 38
 	}
39 39
 
40
-	public function swapFields($index1,$index2){
41
-		if(JArray::swapElements($this->visibleProperties, $index1, $index2)){
40
+	public function swapFields($index1, $index2) {
41
+		if (JArray::swapElements($this->visibleProperties, $index1, $index2)) {
42 42
 			return JArray::swapElements($this->values, $index1, $index2);
43 43
 		}
44 44
 		return false;
45 45
 	}
46 46
 
47
-	public function removeField($index){
48
-		\array_splice($this->visibleProperties,$index,1);
49
-		\array_splice($this->values,$index,1);
50
-		\array_splice($this->captions,$index,1);
47
+	public function removeField($index) {
48
+		\array_splice($this->visibleProperties, $index, 1);
49
+		\array_splice($this->values, $index, 1);
50
+		\array_splice($this->captions, $index, 1);
51 51
 		return $this;
52 52
 	}
53 53
 
54
-	public function getValues(){
54
+	public function getValues() {
55 55
 		$values=[];
56 56
 		$index=0;
57 57
 		$count=$this->count();
58
-		while($index<$count){
58
+		while ($index<$count) {
59 59
 			$values[]=$this->getValue($index++);
60 60
 		}
61 61
 		return $values;
62 62
 	}
63 63
 
64
-	public function getIdentifier($index=NULL){
65
-		if(!isset($index))
64
+	public function getIdentifier($index=NULL) {
65
+		if (!isset($index))
66 66
 			$index=self::$index;
67 67
 		$value=$index;
68
-		if(isset($this->values["identifier"])){
69
-			if(\is_string($this->values["identifier"]))
68
+		if (isset($this->values["identifier"])) {
69
+			if (\is_string($this->values["identifier"]))
70 70
 				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
71 71
 			else
72
-				$value=$this->values["identifier"]($index,$this->instance);
72
+				$value=$this->values["identifier"]($index, $this->instance);
73 73
 		}
74 74
 		return $value;
75 75
 	}
76 76
 
77
-	public function getValue($index){
77
+	public function getValue($index) {
78 78
 		$property=$this->properties[$index];
79 79
 		return $this->_getValue($property, $index);
80 80
 	}
81 81
 
82
-	protected function _beforeAddProperty($index,&$field){
82
+	protected function _beforeAddProperty($index, &$field) {
83 83
 
84 84
 	}
85 85
 
86
-	protected function _getDefaultValue($name,$value,$index){
86
+	protected function _getDefaultValue($name, $value, $index) {
87 87
 		$func=$this->defaultValueFunction;
88
-		return $func($name,$value,$index,$this->instance);
88
+		return $func($name, $value, $index, $this->instance);
89 89
 	}
90 90
 
91
-	protected function _getPropertyValue(\ReflectionProperty $property,$index){
91
+	protected function _getPropertyValue(\ReflectionProperty $property, $index) {
92 92
 		$property->setAccessible(true);
93 93
 		return $property->getValue($this->instance);
94 94
 	}
95 95
 
96
-	protected function _getValue($property,$index){
96
+	protected function _getValue($property, $index) {
97 97
 		$value=null;
98 98
 		$propertyName=$property;
99
-		if($property instanceof \ReflectionProperty){
99
+		if ($property instanceof \ReflectionProperty) {
100 100
 			$value=$this->_getPropertyValue($property, $index);
101 101
 			$propertyName=$property->getName();
102
-		}elseif(\is_callable($property))
102
+		}elseif (\is_callable($property))
103 103
 			$value=$property($this->instance);
104
-		elseif(\is_array($property)){
105
-			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
104
+		elseif (\is_array($property)) {
105
+			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
106 106
 			$value=\implode("", $values);
107
-		}elseif(\is_string($property)){
107
+		}elseif (\is_string($property)) {
108 108
 			$value=$property;
109
-			if(isset($this->instance->{$property})){
109
+			if (isset($this->instance->{$property})) {
110 110
 				$value=$this->instance->{$property};
111
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
111
+			}elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
112 112
 				$value=JReflection::callMethod($this->instance, $getter, []);
113 113
 			}
114 114
 		}
115 115
 		return $this->_postGetValue($index, $propertyName, $value);
116 116
 	}
117 117
 
118
-	protected function _postGetValue($index,$propertyName,$value){
119
-		if(isset($this->values[$index])){
120
-			$value= $this->values[$index]($value,$this->instance,$index);
121
-		}else{
122
-			$value=$this->_getDefaultValue($propertyName,$value, $index);
118
+	protected function _postGetValue($index, $propertyName, $value) {
119
+		if (isset($this->values[$index])) {
120
+			$value=$this->values[$index]($value, $this->instance, $index);
121
+		} else {
122
+			$value=$this->_getDefaultValue($propertyName, $value, $index);
123 123
 		}
124
-		if(isset($this->afterCompile[$index])){
125
-			if(\is_callable($this->afterCompile[$index])){
126
-				$this->afterCompile[$index]($value,$this->instance,$index);
124
+		if (isset($this->afterCompile[$index])) {
125
+			if (\is_callable($this->afterCompile[$index])) {
126
+				$this->afterCompile[$index]($value, $this->instance, $index);
127 127
 			}
128 128
 		}
129 129
 		return $value;
130 130
 	}
131 131
 
132
-	public function insertField($index,$field){
133
-		array_splice( $this->visibleProperties, $index, 0, $field );
132
+	public function insertField($index, $field) {
133
+		array_splice($this->visibleProperties, $index, 0, $field);
134 134
 		return $this;
135 135
 	}
136 136
 
137
-	public function insertInField($index,$field){
137
+	public function insertInField($index, $field) {
138 138
 		$vb=$this->visibleProperties;
139
-		if(isset($vb[$index])){
140
-			if(\is_array($vb[$index])){
139
+		if (isset($vb[$index])) {
140
+			if (\is_array($vb[$index])) {
141 141
 				$this->visibleProperties[$index][]=$field;
142
-			}else{
143
-				$this->visibleProperties[$index]=[$vb[$index],$field];
142
+			} else {
143
+				$this->visibleProperties[$index]=[$vb[$index], $field];
144 144
 			}
145
-		}else{
145
+		} else {
146 146
 			return $this->insertField($index, $field);
147 147
 		}
148 148
 		return $this;
149 149
 	}
150 150
 
151
-	public function addField($field){
151
+	public function addField($field) {
152 152
 		$this->visibleProperties[]=$field;
153 153
 		return $this;
154 154
 	}
155 155
 
156
-	public function count(){
156
+	public function count() {
157 157
 		return \sizeof($this->properties);
158 158
 	}
159 159
 
160
-	public function visiblePropertiesCount(){
160
+	public function visiblePropertiesCount() {
161 161
 		return \sizeof($this->visibleProperties);
162 162
 	}
163 163
 
164
-	public function getProperty($index){
164
+	public function getProperty($index) {
165 165
 		return $this->properties[$index];
166 166
 	}
167 167
 
168
-	public function getFieldName($index){
168
+	public function getFieldName($index) {
169 169
 		$property=$this->getProperty($index);
170
-		if($property instanceof \ReflectionProperty){
170
+		if ($property instanceof \ReflectionProperty) {
171 171
 			$result=$property->getName();
172
-		}elseif(\is_callable($property)){
172
+		}elseif (\is_callable($property)) {
173 173
 			$result=$this->visibleProperties[$index];
174
-		}else{
174
+		} else {
175 175
 			$result=$property;
176 176
 		}
177 177
 		return $result;
178 178
 	}
179 179
 
180 180
 
181
-	protected function showableProperty(\ReflectionProperty $rProperty){
182
-		return JString::startswith($rProperty->getName(),"_")===false;
181
+	protected function showableProperty(\ReflectionProperty $rProperty) {
182
+		return JString::startswith($rProperty->getName(), "_")===false;
183 183
 	}
184 184
 
185 185
 	public function setInstance($instance) {
186
-		if(\is_string($instance)){
186
+		if (\is_string($instance)) {
187 187
 			$instance=new $instance();
188 188
 		}
189 189
 		$this->instance=$instance;
190 190
 		$this->properties=[];
191 191
 		$this->reflect=new \ReflectionClass($instance);
192
-		if(\sizeof($this->visibleProperties)===0){
192
+		if (\sizeof($this->visibleProperties)===0) {
193 193
 			$this->properties=$this->getDefaultProperties();
194
-		}else{
195
-			foreach ($this->visibleProperties as $property){
194
+		} else {
195
+			foreach ($this->visibleProperties as $property) {
196 196
 				$this->setInstanceProperty($property);
197 197
 			}
198 198
 		}
199 199
 		return $this;
200 200
 	}
201 201
 
202
-	private function setInstanceProperty($property){
203
-		if(\is_callable($property)){
202
+	private function setInstanceProperty($property) {
203
+		if (\is_callable($property)) {
204 204
 			$this->properties[]=$property;
205
-		}elseif(\is_string($property)){
206
-			try{
205
+		}elseif (\is_string($property)) {
206
+			try {
207 207
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
208 208
 				$rProperty=$this->reflect->getProperty($property);
209 209
 				$this->properties[]=$rProperty;
210
-			}catch(\Exception $e){
210
+			}catch (\Exception $e) {
211 211
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
212 212
 				$this->properties[]=$property;
213 213
 			}
214
-		}elseif(\is_int($property)){
214
+		}elseif (\is_int($property)) {
215 215
 			$props=$this->getDefaultProperties();
216
-			if(isset($props[$property]))
216
+			if (isset($props[$property]))
217 217
 				$this->properties[]=$props[$property];
218 218
 				else
219 219
 					$this->properties[]=$property;
220
-		}else{
220
+		} else {
221 221
 			$this->properties[]=$property;
222 222
 		}
223 223
 	}
224 224
 
225
-	protected function getDefaultProperties(){
225
+	protected function getDefaultProperties() {
226 226
 		$result=[];
227 227
 		$properties=$this->reflect->getProperties();
228
-		foreach ($properties as $property){
228
+		foreach ($properties as $property) {
229 229
 			$showable=$this->showableProperty($property);
230
-			if($showable!==false){
230
+			if ($showable!==false) {
231 231
 				$result[]=$property;
232 232
 			}
233 233
 		}
@@ -239,12 +239,12 @@  discard block
 block discarded – undo
239 239
 		return $this;
240 240
 	}
241 241
 
242
-	public function setValueFunction($index,$callback){
242
+	public function setValueFunction($index, $callback) {
243 243
 		$this->values[$index]=$callback;
244 244
 		return $this;
245 245
 	}
246 246
 
247
-	public function setIdentifierFunction($callback){
247
+	public function setIdentifierFunction($callback) {
248 248
 		$this->values["identifier"]=$callback;
249 249
 		return $this;
250 250
 	}
@@ -257,41 +257,41 @@  discard block
 block discarded – undo
257 257
 		return $this->properties;
258 258
 	}
259 259
 
260
-	public function getCaption($index){
261
-		if(isset($this->captions[$index])){
260
+	public function getCaption($index) {
261
+		if (isset($this->captions[$index])) {
262 262
 			return $this->captions[$index];
263 263
 		}
264
-		if($this->properties[$index] instanceof \ReflectionProperty)
264
+		if ($this->properties[$index] instanceof \ReflectionProperty)
265 265
 			return $this->properties[$index]->getName();
266
-		elseif(\is_callable($this->properties[$index]))
266
+		elseif (\is_callable($this->properties[$index]))
267 267
 			return "";
268 268
 		else
269 269
 			return $this->properties[$index];
270 270
 	}
271 271
 
272
-	public function getCaptions(){
273
-		if(isset($this->captions)){
274
-			$captions= \array_values($this->captions);
275
-			for($i=\sizeof($captions);$i<$this->count();$i++){
272
+	public function getCaptions() {
273
+		if (isset($this->captions)) {
274
+			$captions=\array_values($this->captions);
275
+			for ($i=\sizeof($captions); $i<$this->count(); $i++) {
276 276
 				$captions[]="";
277 277
 			}
278
-		}else{
278
+		} else {
279 279
 			$captions=[];
280 280
 			$index=0;
281 281
 			$count=$this->count();
282
-			while($index<$count){
282
+			while ($index<$count) {
283 283
 				$captions[]=$this->getCaption($index++);
284 284
 			}
285 285
 		}
286
-		if(isset($this->captionCallback) && \is_callable($this->captionCallback)){
286
+		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
287 287
 			$callback=$this->captionCallback;
288
-			$callback($captions,$this->instance);
288
+			$callback($captions, $this->instance);
289 289
 		}
290 290
 		return $captions;
291 291
 	}
292 292
 
293
-	public function setCaption($index,$caption){
294
-		if(isset($this->captions)===false)
293
+	public function setCaption($index, $caption) {
294
+		if (isset($this->captions)===false)
295 295
 			$this->captions=[];
296 296
 		$this->captions[$index]=$caption;
297 297
 		return $this;
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 	 * @param callable $callback function called after the field compilation
310 310
 	 * @return \Ajax\semantic\widgets\datatable\InstanceViewer
311 311
 	 */
312
-	public function afterCompile($index,$callback){
312
+	public function afterCompile($index, $callback) {
313 313
 		$this->afterCompile[$index]=$callback;
314 314
 		return $this;
315 315
 	}
Please login to merge, or discard this patch.
Ajax/semantic/widgets/base/FieldAsTrait.php 1 patch
Spacing   +109 added lines, -109 removed lines patch added patch discarded remove patch
@@ -27,23 +27,23 @@  discard block
 block discarded – undo
27 27
  * @property boolean $_edition
28 28
  * @property mixed _modelInstance
29 29
  */
30
-trait FieldAsTrait{
30
+trait FieldAsTrait {
31 31
 
32
-	abstract protected function _getFieldIdentifier($prefix,$name="");
33
-	abstract public function setValueFunction($index,$callback);
32
+	abstract protected function _getFieldIdentifier($prefix, $name="");
33
+	abstract public function setValueFunction($index, $callback);
34 34
 	abstract protected function _getFieldName($index);
35 35
 	abstract protected function _getFieldCaption($index);
36
-	abstract protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL);
36
+	abstract protected function _buttonAsSubmit(BaseHtml&$button, $event, $url, $responseElement=NULL, $parameters=NULL);
37 37
 
38 38
 	/**
39 39
 	 * @param HtmlFormField $element
40 40
 	 * @param array $attributes
41 41
 	 */
42
-	protected function _applyAttributes($element,&$attributes,$index){
43
-		if(isset($attributes["jsCallback"])){
42
+	protected function _applyAttributes($element, &$attributes, $index) {
43
+		if (isset($attributes["jsCallback"])) {
44 44
 			$callback=$attributes["jsCallback"];
45
-			if(\is_callable($callback)){
46
-				$callback($element,$this->_modelInstance,$index);
45
+			if (\is_callable($callback)) {
46
+				$callback($element, $this->_modelInstance, $index);
47 47
 				unset($attributes["jsCallback"]);
48 48
 			}
49 49
 		}
@@ -53,43 +53,43 @@  discard block
 block discarded – undo
53 53
 		$element->fromArray($attributes);
54 54
 	}
55 55
 
56
-	private function _getLabelField($caption,$icon=NULL){
57
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
56
+	private function _getLabelField($caption, $icon=NULL) {
57
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
58 58
 		return $label;
59 59
 	}
60 60
 
61 61
 
62
-	protected function _addRules($element,&$attributes){
63
-		if(isset($attributes["rules"])){
62
+	protected function _addRules($element, &$attributes) {
63
+		if (isset($attributes["rules"])) {
64 64
 			$rules=$attributes["rules"];
65
-			if(\is_array($rules)){
65
+			if (\is_array($rules)) {
66 66
 				$element->addRules($rules);
67 67
 			}
68
-			else{
68
+			else {
69 69
 				$element->addRule($rules);
70 70
 			}
71 71
 			unset($attributes["rules"]);
72 72
 		}
73 73
 	}
74 74
 
75
-	protected function _prepareFormFields(&$field,$name,&$attributes){
75
+	protected function _prepareFormFields(&$field, $name, &$attributes) {
76 76
 		$field->setName($name);
77 77
 		$this->_addRules($field, $attributes);
78 78
 		return $field;
79 79
 	}
80 80
 
81
-	protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){
82
-		$this->setValueFunction($index,function($value,$instance,$index) use (&$attributes,$elementCallback,$prefix){
81
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
82
+		$this->setValueFunction($index, function($value, $instance, $index) use (&$attributes, $elementCallback, $prefix){
83 83
 			$caption=$this->_getFieldCaption($index);
84 84
 			$name=$this->_getFieldName($index);
85
-			$id=$this->_getFieldIdentifier($prefix,$name);
86
-			if(isset($attributes["name"])){
85
+			$id=$this->_getFieldIdentifier($prefix, $name);
86
+			if (isset($attributes["name"])) {
87 87
 				$name=$attributes["name"];
88 88
 				unset($attributes["name"]);
89 89
 			}
90
-			$element=$elementCallback($id,$name,$value,$caption);
91
-			if(\is_array($attributes)){
92
-				$this->_applyAttributes($element, $attributes,$index);
90
+			$element=$elementCallback($id, $name, $value, $caption);
91
+			if (\is_array($attributes)) {
92
+				$this->_applyAttributes($element, $attributes, $index);
93 93
 			}
94 94
 			$element->setDisabled(!$this->_edition);
95 95
 			return $element;
@@ -98,176 +98,176 @@  discard block
 block discarded – undo
98 98
 	}
99 99
 
100 100
 
101
-	public function fieldAsProgress($index,$label=NULL, $attributes=array()){
102
-		$this->setValueFunction($index,function($value) use($label,$attributes){
103
-			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes);
101
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
102
+		$this->setValueFunction($index, function($value) use($label, $attributes){
103
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
104 104
 			return $pb;
105 105
 		});
106 106
 			return $this;
107 107
 	}
108 108
 
109
-	public function fieldAsRating($index,$max=5, $icon=""){
110
-		$this->setValueFunction($index,function($value) use($max,$icon){
111
-			$rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon);
109
+	public function fieldAsRating($index, $max=5, $icon="") {
110
+		$this->setValueFunction($index, function($value) use($max, $icon){
111
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
112 112
 			return $rating;
113 113
 		});
114 114
 			return $this;
115 115
 	}
116 116
 
117
-	public function fieldAsLabel($index,$icon=NULL,$attributes=NULL){
118
-		return $this->_fieldAs(function($id,$name,$value) use($icon){
119
-			$lbl=new HtmlLabel($id,$value);
120
-			if(isset($icon))
117
+	public function fieldAsLabel($index, $icon=NULL, $attributes=NULL) {
118
+		return $this->_fieldAs(function($id, $name, $value) use($icon){
119
+			$lbl=new HtmlLabel($id, $value);
120
+			if (isset($icon))
121 121
 				$lbl->addIcon($icon);
122 122
 				return $lbl;
123
-		}, $index,$attributes,"label");
123
+		}, $index, $attributes, "label");
124 124
 	}
125 125
 
126
-	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
127
-		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
128
-			$header=new HtmlHeader($id,$niveau,$value);
129
-			if(isset($icon))
126
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
127
+		return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){
128
+			$header=new HtmlHeader($id, $niveau, $value);
129
+			if (isset($icon))
130 130
 				$header->asIcon($icon, $value);
131 131
 			return $header;
132
-		}, $index,$attributes,"header");
132
+		}, $index, $attributes, "header");
133 133
 	}
134 134
 
135 135
 
136
-	public function fieldAsImage($index,$size=Size::MINI,$circular=false){
137
-		$this->setValueFunction($index,function($img) use($size,$circular){
138
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
136
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
137
+		$this->setValueFunction($index, function($img) use($size, $circular){
138
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular();
139 139
 			return $image;
140 140
 		});
141 141
 			return $this;
142 142
 	}
143 143
 
144
-	public function fieldAsFlag($index){
145
-		$this->setValueFunction($index,function($flag){
146
-			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"),$flag);
144
+	public function fieldAsFlag($index) {
145
+		$this->setValueFunction($index, function($flag) {
146
+			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
147 147
 			return $flag;
148 148
 		});
149 149
 			return $this;
150 150
 	}
151 151
 
152
-	public function fieldAsAvatar($index,$attributes=NULL){
153
-		return $this->_fieldAs(function($id,$name,$value){
154
-			$img=new HtmlImage($id,$value);
152
+	public function fieldAsAvatar($index, $attributes=NULL) {
153
+		return $this->_fieldAs(function($id, $name, $value) {
154
+			$img=new HtmlImage($id, $value);
155 155
 			$img->asAvatar();
156 156
 			return $img;
157
-		}, $index,$attributes,"avatar");
157
+		}, $index, $attributes, "avatar");
158 158
 	}
159 159
 
160
-	public function fieldAsRadio($index,$attributes=NULL){
161
-		return $this->_fieldAs(function($id,$name,$value) use($attributes){
162
-			$input= new HtmlRadio($id,$name,$value,$value);
160
+	public function fieldAsRadio($index, $attributes=NULL) {
161
+		return $this->_fieldAs(function($id, $name, $value) use($attributes){
162
+			$input=new HtmlRadio($id, $name, $value, $value);
163 163
 			return $this->_prepareFormFields($input, $name, $attributes);
164
-		}, $index,$attributes,"radio");
164
+		}, $index, $attributes, "radio");
165 165
 	}
166 166
 
167
-	public function fieldAsRadios($index,$elements=[],$attributes=NULL){
168
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements){
169
-			return HtmlFormFields::radios($name,$elements,$caption,$value);
170
-		}, $index,$attributes,"radios");
167
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
168
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements){
169
+			return HtmlFormFields::radios($name, $elements, $caption, $value);
170
+		}, $index, $attributes, "radios");
171 171
 	}
172 172
 
173
-	public function fieldAsInput($index,$attributes=NULL){
174
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
175
-			$input= new HtmlFormInput($id,$caption,"text",$value);
173
+	public function fieldAsInput($index, $attributes=NULL) {
174
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
175
+			$input=new HtmlFormInput($id, $caption, "text", $value);
176 176
 			return $this->_prepareFormFields($input, $name, $attributes);
177
-		}, $index,$attributes,"input");
177
+		}, $index, $attributes, "input");
178 178
 	}
179 179
 
180
-	public function fieldAsTextarea($index,$attributes=NULL){
181
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
182
-			$textarea=new HtmlFormTextarea($id,$caption,$value);
180
+	public function fieldAsTextarea($index, $attributes=NULL) {
181
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
182
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
183 183
 			return $this->_prepareFormFields($textarea, $name, $attributes);
184
-		}, $index,$attributes,"textarea");
184
+		}, $index, $attributes, "textarea");
185 185
 	}
186 186
 
187
-	public function fieldAsHidden($index,$attributes=NULL){
188
-		if(!\is_array($attributes)){
187
+	public function fieldAsHidden($index, $attributes=NULL) {
188
+		if (!\is_array($attributes)) {
189 189
 			$attributes=[];
190 190
 		}
191 191
 		$attributes["inputType"]="hidden";
192
-		return $this->fieldAsInput($index,$attributes);
192
+		return $this->fieldAsInput($index, $attributes);
193 193
 	}
194 194
 
195
-	public function fieldAsCheckbox($index,$attributes=NULL){
196
-		return $this->_fieldAs(function($id,$name,$value,$caption) use($attributes){
197
-			$input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier());
195
+	public function fieldAsCheckbox($index, $attributes=NULL) {
196
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($attributes){
197
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
198 198
 			$input->setChecked(JString::isBooleanTrue($value));
199 199
 			return $this->_prepareFormFields($input, $name, $attributes);
200
-		}, $index,$attributes,"ck");
200
+		}, $index, $attributes, "ck");
201 201
 	}
202 202
 
203
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
204
-		return $this->_fieldAs(function($id,$name,$value,$caption) use($elements,$multiple,$attributes){
205
-			$dd=new HtmlFormDropdown($id,$elements,$caption,$value);
206
-			$dd->asSelect($name,$multiple);
203
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
204
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($elements, $multiple, $attributes){
205
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value);
206
+			$dd->asSelect($name, $multiple);
207 207
 			return $this->_prepareFormFields($dd, $name, $attributes);
208
-		}, $index,$attributes,"dd");
208
+		}, $index, $attributes, "dd");
209 209
 	}
210 210
 
211
-	public function fieldAsMessage($index,$attributes=NULL){
212
-		return $this->_fieldAs(function($id,$name,$value,$caption){
213
-			$mess= new HtmlMessage("message-".$id,$caption);
211
+	public function fieldAsMessage($index, $attributes=NULL) {
212
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
213
+			$mess=new HtmlMessage("message-".$id, $caption);
214 214
 			$mess->addHeader($value);
215 215
 			return $mess;
216
-		}, $index,$attributes,"message");
216
+		}, $index, $attributes, "message");
217 217
 	}
218 218
 
219
-	public function fieldAsLink($index,$attributes=NULL){
220
-		return $this->_fieldAs(function($id,$name,$value,$caption){
221
-			$lnk= new HtmlLink("message-".$id,"#",$caption);
219
+	public function fieldAsLink($index, $attributes=NULL) {
220
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
221
+			$lnk=new HtmlLink("message-".$id, "#", $caption);
222 222
 			return $lnk;
223
-		}, $index,$attributes,"link");
223
+		}, $index, $attributes, "link");
224 224
 	}
225 225
 
226 226
 	/**Change fields type
227 227
 	 * @param array $types an array or associative array $type=>$attributes
228 228
 	 */
229
-	public function fieldsAs(array $types){
229
+	public function fieldsAs(array $types) {
230 230
 		$i=0;
231
-		if(JArray::isAssociative($types)){
232
-			foreach ($types as $type=>$attributes){
233
-				if(\is_int($type))
234
-					$this->fieldAs($i++,$attributes,[]);
235
-				else{
236
-					$type=preg_replace('/\d/', '', $type );
237
-					$this->fieldAs($i++,$type,$attributes);
231
+		if (JArray::isAssociative($types)) {
232
+			foreach ($types as $type=>$attributes) {
233
+				if (\is_int($type))
234
+					$this->fieldAs($i++, $attributes, []);
235
+				else {
236
+					$type=preg_replace('/\d/', '', $type);
237
+					$this->fieldAs($i++, $type, $attributes);
238 238
 				}
239 239
 			}
240
-		}else{
241
-			foreach ($types as $type){
242
-				$this->fieldAs($i++,$type);
240
+		} else {
241
+			foreach ($types as $type) {
242
+				$this->fieldAs($i++, $type);
243 243
 			}
244 244
 		}
245 245
 	}
246 246
 
247
-	public function fieldAs($index,$type,$attributes=NULL){
247
+	public function fieldAs($index, $type, $attributes=NULL) {
248 248
 		$method="fieldAs".\ucfirst($type);
249
-		if(\method_exists($this, $method)){
250
-			if(!\is_array($attributes)){
249
+		if (\method_exists($this, $method)) {
250
+			if (!\is_array($attributes)) {
251 251
 				$attributes=[$index];
252
-			}else{
252
+			} else {
253 253
 				\array_unshift($attributes, $index);
254 254
 			}
255
-			\call_user_func_array([$this,$method], $attributes);
255
+			\call_user_func_array([$this, $method], $attributes);
256 256
 		}
257 257
 	}
258 258
 
259
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
260
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
261
-			$button=new HtmlButton($id,$caption,$cssStyle);
262
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]);
259
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
260
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){
261
+			$button=new HtmlButton($id, $caption, $cssStyle);
262
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]);
263 263
 			return $button;
264
-		}, $index,$attributes,"submit");
264
+		}, $index, $attributes, "submit");
265 265
 	}
266 266
 
267
-	public function fieldAsButton($index,$cssStyle=NULL,$attributes=NULL){
268
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
269
-			$button=new HtmlButton($id,$value,$cssStyle);
267
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
268
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
269
+			$button=new HtmlButton($id, $value, $cssStyle);
270 270
 			return $button;
271
-		}, $index,$attributes,"button");
271
+		}, $index, $attributes, "button");
272 272
 	}
273 273
 }
274 274
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/html/BaseHtml.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -15,11 +15,11 @@  discard block
 block discarded – undo
15 15
  * @version 1.3
16 16
  */
17 17
 abstract class BaseHtml extends BaseWidget {
18
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
18
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
19 19
 	protected $_template;
20 20
 	protected $tagName;
21
-	protected $_wrapBefore=array ();
22
-	protected $_wrapAfter=array ();
21
+	protected $_wrapBefore=array();
22
+	protected $_wrapAfter=array();
23 23
 	protected $_bsComponent;
24 24
 	protected $_compiled=false;
25 25
 
@@ -30,14 +30,14 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	abstract public function run(JsUtils $js);
32 32
 
33
-	private function _callSetter($setter,$key,$value,&$array){
33
+	private function _callSetter($setter, $key, $value, &$array) {
34 34
 		$result=false;
35 35
 		if (method_exists($this, $setter) && !JString::startswith($key, "_")) {
36 36
 			try {
37 37
 				$this->$setter($value);
38 38
 				unset($array[$key]);
39 39
 				$result=true;
40
-			} catch ( \Exception $e ) {
40
+			}catch (\Exception $e) {
41 41
 				$result=false;
42 42
 			}
43 43
 		}
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
45 45
 	}
46 46
 
47 47
 	protected function getTemplate(JsUtils $js=NULL) {
48
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
48
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
49 49
 	}
50 50
 
51 51
 	protected function ctrl($name, $value, $typeCtrl) {
52 52
 		if (\is_array($typeCtrl)) {
53
-			if (array_search($value, $typeCtrl) === false) {
54
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
53
+			if (array_search($value, $typeCtrl)===false) {
54
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
55 55
 			}
56 56
 		} else {
57 57
 			if (!$typeCtrl($value)) {
58
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
58
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
59 59
 			}
60 60
 		}
61 61
 		return true;
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 
66 66
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
67
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
67
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
68 68
 			return $name=$value;
69 69
 		}
70 70
 		return $this;
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
74 74
 		if (\is_array($typeCtrl)) {
75 75
 			$this->removeOldValues($name, $typeCtrl);
76
-			$name.=$separator . $value;
76
+			$name.=$separator.$value;
77 77
 		}
78 78
 		return $this;
79 79
 	}
@@ -81,17 +81,17 @@  discard block
 block discarded – undo
81 81
 
82 82
 
83 83
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
84
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
84
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
85 85
 			if (\is_array($typeCtrl)) {
86 86
 				$this->removeOldValues($name, $typeCtrl);
87 87
 			}
88
-			$name.=$separator . $value;
88
+			$name.=$separator.$value;
89 89
 		}
90 90
 		return $this;
91 91
 	}
92 92
 
93 93
 	protected function addToMember(&$name, $value, $separator=" ") {
94
-		$name=str_ireplace($value, "", $name) . $separator . $value;
94
+		$name=str_ireplace($value, "", $name).$separator.$value;
95 95
 		return $this;
96 96
 	}
97 97
 
@@ -102,18 +102,18 @@  discard block
 block discarded – undo
102 102
 		$oldValue=trim($oldValue);
103 103
 	}
104 104
 
105
-	protected function _getElementBy($callback,$elements){
105
+	protected function _getElementBy($callback, $elements) {
106 106
 		if (\is_array($elements)) {
107 107
 			$elements=\array_values($elements);
108 108
 			$flag=false;
109 109
 			$index=0;
110
-			while ( !$flag && $index < sizeof($elements) ) {
110
+			while (!$flag && $index<sizeof($elements)) {
111 111
 				if ($elements[$index] instanceof BaseHtml)
112 112
 					$flag=($callback($elements[$index]));
113 113
 					$index++;
114 114
 			}
115
-			if ($flag === true)
116
-				return $elements[$index - 1];
115
+			if ($flag===true)
116
+				return $elements[$index-1];
117 117
 		} elseif ($elements instanceof BaseHtml) {
118 118
 			if ($callback($elements))
119 119
 				return $elements;
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
141 141
 	}
142 142
 
143 143
 	public function fromArray($array) {
144
-		foreach ( $this as $key => $value ) {
145
-			if(array_key_exists($key, $array)===true)
146
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
144
+		foreach ($this as $key => $value) {
145
+			if (array_key_exists($key, $array)===true)
146
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
147 147
 		}
148
-		foreach ( $array as $key => $value ) {
149
-			if($this->_callSetter($key, $key, $value, $array)===false){
150
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
148
+		foreach ($array as $key => $value) {
149
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
150
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
151 151
 			}
152 152
 		}
153 153
 		return $array;
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 
156 156
 	public function fromDatabaseObjects($objects, $function) {
157 157
 		if (isset($objects)) {
158
-			foreach ( $objects as $object ) {
158
+			foreach ($objects as $object) {
159 159
 				$this->fromDatabaseObject($object, $function);
160 160
 			}
161 161
 		}
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 
177 177
 
178 178
 	public function getElementById($identifier, $elements) {
179
-		return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
179
+		return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
180 180
 	}
181 181
 
182 182
 	public function getBsComponent() {
@@ -191,24 +191,24 @@  discard block
 block discarded – undo
191 191
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
192 192
 	}
193 193
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
194
-		if(!$this->_compiled){
195
-			$this->compile_once($js,$view);
194
+		if (!$this->_compiled) {
195
+			$this->compile_once($js, $view);
196 196
 			$this->_compiled=true;
197 197
 		}
198 198
 		$result=$this->getTemplate($js);
199
-		foreach ( $this as $key => $value ) {
200
-			if (JString::startswith($key, "_") === false && $key !== "events") {
199
+		foreach ($this as $key => $value) {
200
+			if (JString::startswith($key, "_")===false && $key!=="events") {
201 201
 				if (\is_array($value)) {
202 202
 					$v=PropertyWrapper::wrap($value, $js);
203 203
 				} else {
204 204
 					$v=$value;
205 205
 				}
206
-				$result=str_ireplace("%" . $key . "%", $v, $result);
206
+				$result=str_ireplace("%".$key."%", $v, $result);
207 207
 			}
208 208
 		}
209 209
 		if (isset($js)===true) {
210 210
 			$this->run($js);
211
-			if (isset($view) === true) {
211
+			if (isset($view)===true) {
212 212
 				$js->addViewElement($this->_identifier, $result, $view);
213 213
 			}
214 214
 		}
Please login to merge, or discard this patch.
Ajax/semantic/html/content/table/HtmlTD.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 use Ajax\semantic\html\base\constants\Wide;
12 12
 
13 13
 class HtmlTD extends HtmlSemDoubleElement {
14
-	use TextAlignmentTrait,TableElementTrait;
14
+	use TextAlignmentTrait, TableElementTrait;
15 15
 	private $_container;
16 16
 	private $_row;
17 17
 	private $_col;
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 	 */
27 27
 	public function __construct($identifier, $content=NULL, $tagName="td") {
28 28
 		parent::__construct($identifier, $tagName, "", $content);
29
-		$this->_variations=[ Variation::COLLAPSING ];
30
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
29
+		$this->_variations=[Variation::COLLAPSING];
30
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
31 31
 	}
32 32
 
33 33
 	public function setContainer($container, $row, $col) {
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	}
48 48
 
49 49
 	public function setRowspan($rowspan) {
50
-		$to=min($this->_container->count(), $this->_row + $rowspan - 1);
51
-		for($i=$to; $i > $this->_row; $i--) {
50
+		$to=min($this->_container->count(), $this->_row+$rowspan-1);
51
+		for ($i=$to; $i>$this->_row; $i--) {
52 52
 			$this->_container->delete($i, $this->_col);
53 53
 		}
54 54
 		$this->setProperty("rowspan", $rowspan);
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 
58 58
 	public function mergeRow() {
59
-		if(!$this->_rowMerged){
59
+		if (!$this->_rowMerged) {
60 60
 			$this->_rowMerged=true;
61 61
 			return $this->setRowspan($this->_container->count());
62 62
 		}
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	}
65 65
 
66 66
 	public function mergeCol() {
67
-		if(!$this->_colMerged){
67
+		if (!$this->_colMerged) {
68 68
 			$this->_colMerged=true;
69 69
 			return $this->setColspan($this->_container->getRow($this->_row)->count());
70 70
 		}
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 	}
73 73
 
74 74
 	public function setColspan($colspan) {
75
-		$to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1);
76
-		for($i=$to; $i > $this->_col; $i--) {
77
-			$this->_container->delete($this->_row, $this->_col + 1);
75
+		$to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1);
76
+		for ($i=$to; $i>$this->_col; $i--) {
77
+			$this->_container->delete($this->_row, $this->_col+1);
78 78
 		}
79 79
 		$this->setProperty("colspan", $colspan);
80 80
 		return $this->_container;
@@ -113,11 +113,11 @@  discard block
 block discarded – undo
113 113
 		return $this->addToProperty("class", "selectable");
114 114
 	}
115 115
 	
116
-	public function setWidth($width){
116
+	public function setWidth($width) {
117 117
 		if (\is_int($width)) {
118
-			$width=Wide::getConstants()["W" . $width];
118
+			$width=Wide::getConstants()["W".$width];
119 119
 		}
120 120
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
121
-		return $this->addToPropertyCtrl("class", "wide", array ("wide" ));
121
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
122 122
 	}
123 123
 }
124 124
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/table/HtmlTable.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
 
28 28
 	public function __construct($identifier, $rowCount, $colCount) {
29 29
 		parent::__construct($identifier, "table", "ui table");
30
-		$this->content=array ();
30
+		$this->content=array();
31 31
 		$this->setRowCount($rowCount, $colCount);
32
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
33
-		$this->_compileParts=["thead","tbody","tfoot"];
32
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
33
+		$this->_compileParts=["thead", "tbody", "tfoot"];
34 34
 		$this->_afterCompileEvents=[];
35 35
 	}
36 36
 
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
 	 * @return HtmlTableContent
49 49
 	 */
50 50
 	public function getPart($key) {
51
-		if (\array_key_exists($key, $this->content) === false) {
51
+		if (\array_key_exists($key, $this->content)===false) {
52 52
 			$this->content[$key]=new HtmlTableContent("", $key);
53
-			if ($key !== "tbody") {
53
+			if ($key!=="tbody") {
54 54
 				$this->content[$key]->setRowCount(1, $this->_colCount);
55 55
 			}
56 56
 		}
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @return boolean
96 96
 	 */
97 97
 	public function hasPart($key) {
98
-		return \array_key_exists($key, $this->content) === true;
98
+		return \array_key_exists($key, $this->content)===true;
99 99
 	}
100 100
 
101 101
 	/**
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 
231 231
 	private function colAlign($colIndex, $function) {
232 232
 		if (\is_array($colIndex)) {
233
-			foreach ( $colIndex as $cIndex ) {
233
+			foreach ($colIndex as $cIndex) {
234 234
 				$this->colAlign($cIndex, $function);
235 235
 			}
236 236
 		} else {
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 	 * @see HtmlSemDoubleElement::compile()
292 292
 	 */
293 293
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
294
-		if(\sizeof($this->_compileParts)<3){
294
+		if (\sizeof($this->_compileParts)<3) {
295 295
 			$this->_template="%content%";
296 296
 			$this->refresh();
297 297
 		}
@@ -301,9 +301,9 @@  discard block
 block discarded – undo
301 301
 
302 302
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
303 303
 		if ($this->propertyContains("class", "sortable")) {
304
-			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
304
+			$this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));");
305 305
 		}
306
-		if(isset($this->_activeRowSelector)){
306
+		if (isset($this->_activeRowSelector)) {
307 307
 			$this->_activeRowSelector->compile();
308 308
 		}
309 309
 	}
@@ -317,13 +317,13 @@  discard block
 block discarded – undo
317 317
 	public function fromDatabaseObject($object, $function) {
318 318
 		$result=$function($object);
319 319
 		if (\is_array($result)) {
320
-			$result= $this->addRow($function($object));
320
+			$result=$this->addRow($function($object));
321 321
 		} else {
322
-			$result= $this->getBody()->_addRow($result);
322
+			$result=$this->getBody()->_addRow($result);
323 323
 		}
324
-		if(isset($this->_afterCompileEvents["onNewRow"])){
325
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
326
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
324
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
325
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
326
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
327 327
 		}
328 328
 		return $result;
329 329
 	}
@@ -338,14 +338,14 @@  discard block
 block discarded – undo
338 338
 		return $this;
339 339
 	}
340 340
 
341
-	public function refresh(){
341
+	public function refresh() {
342 342
 		$this->_footer=$this->getFooter();
343 343
 		$this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");');
344 344
 	}
345 345
 
346
-	public function run(JsUtils $js){
347
-		$result= parent::run($js);
348
-		if(isset($this->_footer))
346
+	public function run(JsUtils $js) {
347
+		$result=parent::run($js);
348
+		if (isset($this->_footer))
349 349
 			$this->_footer->run($js);
350 350
 		return $result;
351 351
 	}
@@ -368,27 +368,27 @@  discard block
 block discarded – undo
368 368
 	 * @param boolean $multiple
369 369
 	 * @return HtmlTable
370 370
 	 */
371
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
372
-		$this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple);
371
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
372
+		$this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple);
373 373
 		return $this;
374 374
 	}
375 375
 
376
-	public function hideColumn($colIndex){
377
-		if($this->hasPart("thead")){
376
+	public function hideColumn($colIndex) {
377
+		if ($this->hasPart("thead")) {
378 378
 			$this->getHeader()->hideColumn($colIndex);
379 379
 		}
380 380
 		$this->getBody()->hideColumn($colIndex);
381
-		if($this->hasPart("tfoot")){
381
+		if ($this->hasPart("tfoot")) {
382 382
 			$this->getFooter()->hideColumn($colIndex);
383 383
 		}
384 384
 		return $this;
385 385
 	}
386 386
 	
387
-	public function setColWidth($colIndex,$width){
388
-		if($this->hasPart("thead")){
387
+	public function setColWidth($colIndex, $width) {
388
+		if ($this->hasPart("thead")) {
389 389
 			$this->getHeader()->getCell(0, $colIndex)->setWidth($width);
390
-		}else{
391
-			if($this->getBody()->count()>0)
390
+		} else {
391
+			if ($this->getBody()->count()>0)
392 392
 				$this->getBody()->getCell(0, $colIndex)->setWidth($width);
393 393
 		}
394 394
 		return $this;
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTable.php 1 patch
Spacing   +100 added lines, -100 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
  *
24 24
  */
25 25
 class DataTable extends Widget {
26
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait;
26
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait;
27 27
 	protected $_searchField;
28 28
 	protected $_urls;
29 29
 	protected $_pagination;
@@ -41,35 +41,35 @@  discard block
 block discarded – undo
41 41
 	protected $_colWidths;
42 42
 
43 43
 
44
-	public function __construct($identifier,$model,$modelInstance=NULL) {
45
-		parent::__construct($identifier, $model,$modelInstance);
46
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
44
+	public function __construct($identifier, $model, $modelInstance=NULL) {
45
+		parent::__construct($identifier, $model, $modelInstance);
46
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
47 47
 		$this->_urls=[];
48
-		$this->_emptyMessage=new HtmlMessage("","nothing to display");
48
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
49 49
 		$this->_emptyMessage->setIcon("info circle");
50 50
 	}
51 51
 
52
-	public function run(JsUtils $js){
53
-		if($this->_hasCheckboxes && isset($js)){
52
+	public function run(JsUtils $js) {
53
+		if ($this->_hasCheckboxes && isset($js)) {
54 54
 			$this->_runCheckboxes($js);
55 55
 		}
56
-		if($this->_visibleHover){
57
-			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
58
-			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
56
+		if ($this->_visibleHover) {
57
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]);
58
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]);
59 59
 		}
60
-		if(\is_array($this->_deleteBehavior))
61
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
62
-		if(\is_array($this->_editBehavior))
63
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
60
+		if (\is_array($this->_deleteBehavior))
61
+			$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
62
+		if (\is_array($this->_editBehavior))
63
+			$this->_generateBehavior("edit", $this->_editBehavior, $js);
64 64
 		return parent::run($js);
65 65
 	}
66 66
 
67 67
 
68 68
 
69
-	protected function _generateBehavior($op,$params,JsUtils $js){
70
-		if(isset($this->_urls[$op])){
71
-			$params=\array_merge($params,["attr"=>"data-ajax"]);
72
-			$js->getOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector(),$params);
69
+	protected function _generateBehavior($op, $params, JsUtils $js) {
70
+		if (isset($this->_urls[$op])) {
71
+			$params=\array_merge($params, ["attr"=>"data-ajax"]);
72
+			$js->getOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector(), $params);
73 73
 		}
74 74
 	}
75 75
 
@@ -82,155 +82,155 @@  discard block
 block discarded – undo
82 82
 	}
83 83
 
84 84
 
85
-	public function compile(JsUtils $js=NULL,&$view=NULL){
86
-		if(!$this->_generated){
85
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
86
+		if (!$this->_generated) {
87 87
 			$this->_instanceViewer->setInstance($this->_model);
88 88
 			$captions=$this->_instanceViewer->getCaptions();
89 89
 
90 90
 			$table=$this->content["table"];
91 91
 
92
-			if($this->_hasCheckboxes){
92
+			if ($this->_hasCheckboxes) {
93 93
 				$this->_generateMainCheckbox($captions);
94 94
 			}
95 95
 
96 96
 			$table->setRowCount(0, \sizeof($captions));
97
-			$this->_generateHeader($table,$captions);
97
+			$this->_generateHeader($table, $captions);
98 98
 
99
-			if(isset($this->_compileParts))
99
+			if (isset($this->_compileParts))
100 100
 				$table->setCompileParts($this->_compileParts);
101 101
 
102
-			if(isset($this->_searchField) && isset($js)){
103
-				if(isset($this->_urls["refresh"]))
104
-					$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
102
+			if (isset($this->_searchField) && isset($js)) {
103
+				if (isset($this->_urls["refresh"]))
104
+					$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
105 105
 			}
106 106
 
107 107
 			$this->_generateContent($table);
108 108
 
109
-			if($this->_hasCheckboxes && $table->hasPart("thead")){
109
+			if ($this->_hasCheckboxes && $table->hasPart("thead")) {
110 110
 					$table->getHeader()->getCell(0, 0)->addClass("no-sort");
111 111
 			}
112 112
 
113
-			if(isset($this->_toolbar)){
113
+			if (isset($this->_toolbar)) {
114 114
 				$this->_setToolbarPosition($table, $captions);
115 115
 			}
116
-			if(isset($this->_pagination) && $this->_pagination->getVisible()){
117
-				$this->_generatePagination($table,$js);
116
+			if (isset($this->_pagination) && $this->_pagination->getVisible()) {
117
+				$this->_generatePagination($table, $js);
118 118
 			}
119 119
 
120
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
120
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
121 121
 			$this->_compileForm();
122
-			if(isset($this->_hiddenColumns))
122
+			if (isset($this->_hiddenColumns))
123 123
 				$this->_hideColumns();
124
-			if(isset($this->_colWidths)){
125
-				foreach ($this->_colWidths as $colIndex=>$width){
126
-					$table->setColWidth($colIndex,$width);
124
+			if (isset($this->_colWidths)) {
125
+				foreach ($this->_colWidths as $colIndex=>$width) {
126
+					$table->setColWidth($colIndex, $width);
127 127
 				}
128 128
 			}
129 129
 			
130 130
 			$this->_generated=true;
131 131
 		}
132
-		return parent::compile($js,$view);
132
+		return parent::compile($js, $view);
133 133
 	}
134 134
 
135
-	protected function _hideColumns(){
135
+	protected function _hideColumns() {
136 136
 		$table=$this->getTable();
137
-		foreach ($this->_hiddenColumns as $colIndex){
137
+		foreach ($this->_hiddenColumns as $colIndex) {
138 138
 			$table->hideColumn($colIndex);
139 139
 		}
140 140
 		return $this;
141 141
 	}
142 142
 
143
-	protected function _generateHeader(HtmlTable $table,$captions){
143
+	protected function _generateHeader(HtmlTable $table, $captions) {
144 144
 		$table->setHeaderValues($captions);
145
-		if(isset($this->_sortable)){
145
+		if (isset($this->_sortable)) {
146 146
 			$table->setSortable($this->_sortable);
147 147
 		}
148 148
 	}
149 149
 
150 150
 
151 151
 
152
-	protected function _generateContent($table){
152
+	protected function _generateContent($table) {
153 153
 		$objects=$this->_modelInstance;
154
-		if(isset($this->_pagination)){
154
+		if (isset($this->_pagination)) {
155 155
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
156 156
 		}
157 157
 			InstanceViewer::setIndex(0);
158 158
 			$table->fromDatabaseObjects($objects, function($instance) use($table){
159 159
 				return $this->_generateRow($instance, $table);
160 160
 			});
161
-		if($table->getRowCount()==0){
161
+		if ($table->getRowCount()==0) {
162 162
 			$result=$table->addRow();
163 163
 			$result->mergeRow();
164 164
 			$result->setValues([$this->_emptyMessage]);
165 165
 		}
166 166
 	}
167 167
 
168
-	protected function _generateRow($instance,&$table,$checkedClass=null){
168
+	protected function _generateRow($instance, &$table, $checkedClass=null) {
169 169
 		$this->_instanceViewer->setInstance($instance);
170 170
 		InstanceViewer::$index++;
171
-		$values= $this->_instanceViewer->getValues();
171
+		$values=$this->_instanceViewer->getValues();
172 172
 		$id=$this->_instanceViewer->getIdentifier();
173
-		if($this->_hasCheckboxes){
174
-			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,"");
173
+		if ($this->_hasCheckboxes) {
174
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
175 175
 			$ck->setOnChange("event.stopPropagation();");
176 176
 			$field=$ck->getField();
177
-			$field->setProperty("value",$id);
177
+			$field->setProperty("value", $id);
178 178
 			$field->setProperty("name", "selection[]");
179
-			if(isset($checkedClass))
179
+			if (isset($checkedClass))
180 180
 				$field->setClass($checkedClass);
181 181
 			\array_unshift($values, $ck);
182 182
 		}
183 183
 		$result=$table->newRow();
184 184
 		$result->setIdentifier($this->identifier."-tr-".$id);
185
-		$result->setProperty("data-ajax",$id);
185
+		$result->setProperty("data-ajax", $id);
186 186
 		$result->setValues($values);
187
-		$result->addToProperty("class",$this->_rowClass);
187
+		$result->addToProperty("class", $this->_rowClass);
188 188
 		return $result;
189 189
 	}
190 190
 
191
-	protected function _generatePagination($table,$js=NULL){
192
-		if(isset($this->_toolbar)){
193
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
191
+	protected function _generatePagination($table, $js=NULL) {
192
+		if (isset($this->_toolbar)) {
193
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
194 194
 				$this->_toolbar->setFloated("left");
195 195
 		}
196 196
 		$footer=$table->getFooter();
197 197
 		$footer->mergeCol();
198
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
198
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
199 199
 		$menu->floatRight();
200 200
 		$menu->setActiveItem($this->_pagination->getPage()-1);
201 201
 		$footer->addValues($menu);
202
-		$this->_associatePaginationBehavior($menu,$js);
202
+		$this->_associatePaginationBehavior($menu, $js);
203 203
 	}
204 204
 
205
-	protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL){
206
-		if(isset($this->_urls["refresh"])){
207
-			$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}",$this->getRefreshSelector(),["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
205
+	protected function _associatePaginationBehavior(HtmlMenu $menu, JsUtils $js=NULL) {
206
+		if (isset($this->_urls["refresh"])) {
207
+			$menu->postOnClick($this->_urls["refresh"], "{'p':$(this).attr('data-page')}", $this->getRefreshSelector(), ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
208 208
 		}
209 209
 	}
210 210
 
211
-	protected function _getFieldName($index){
211
+	protected function _getFieldName($index) {
212 212
 		$fieldName=parent::_getFieldName($index);
213
-		if(\is_object($fieldName))
213
+		if (\is_object($fieldName))
214 214
 			$fieldName="field-".$index;
215 215
 		return $fieldName."[]";
216 216
 	}
217 217
 
218
-	protected function _getFieldCaption($index){
218
+	protected function _getFieldCaption($index) {
219 219
 		return null;
220 220
 	}
221 221
 
222
-	protected function _setToolbarPosition($table,$captions=NULL){
223
-		switch ($this->_toolbarPosition){
222
+	protected function _setToolbarPosition($table, $captions=NULL) {
223
+		switch ($this->_toolbarPosition) {
224 224
 			case PositionInTable::BEFORETABLE:
225 225
 			case PositionInTable::AFTERTABLE:
226
-				if(isset($this->_compileParts)===false){
226
+				if (isset($this->_compileParts)===false) {
227 227
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
228 228
 				}
229 229
 				break;
230 230
 			case PositionInTable::HEADER:
231 231
 			case PositionInTable::FOOTER:
232 232
 			case PositionInTable::BODY:
233
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
233
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
234 234
 				break;
235 235
 		}
236 236
 	}
@@ -242,23 +242,23 @@  discard block
 block discarded – undo
242 242
 	 * @param callable $callback function called after the field compilation
243 243
 	 * @return DataTable
244 244
 	 */
245
-	public function afterCompile($index,$callback){
246
-		$this->_instanceViewer->afterCompile($index,$callback);
245
+	public function afterCompile($index, $callback) {
246
+		$this->_instanceViewer->afterCompile($index, $callback);
247 247
 		return $this;
248 248
 	}
249 249
 
250
-	private function addToolbarRow($part,$table,$captions){
250
+	private function addToolbarRow($part, $table, $captions) {
251 251
 		$hasPart=$table->hasPart($part);
252
-		if($hasPart){
252
+		if ($hasPart) {
253 253
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
254
-		}else{
254
+		} else {
255 255
 			$row=$table->getPart($part)->getRow(0);
256 256
 		}
257 257
 		$row->mergeCol();
258 258
 		$row->setValues([$this->_toolbar]);
259 259
 	}
260 260
 
261
-	public function getHtmlComponent(){
261
+	public function getHtmlComponent() {
262 262
 		return $this->content["table"];
263 263
 	}
264 264
 
@@ -272,12 +272,12 @@  discard block
 block discarded – undo
272 272
 	 * @return DataTable
273 273
 	 */
274 274
 	public function setUrls($urls) {
275
-		if(\is_array($urls)){
276
-			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
277
-			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
278
-			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
279
-		}else{
280
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
275
+		if (\is_array($urls)) {
276
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
277
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
278
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
279
+		} else {
280
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls];
281 281
 		}
282 282
 		return $this;
283 283
 	}
@@ -290,8 +290,8 @@  discard block
 block discarded – undo
290 290
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
291 291
 	 * @return DataTable
292 292
 	 */
293
-	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){
294
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page,$total_rowcount);
293
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
294
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
295 295
 		return $this;
296 296
 	}
297 297
 
@@ -302,8 +302,8 @@  discard block
 block discarded – undo
302 302
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
303 303
 	 * @return DataTable
304 304
 	 */
305
-	public function autoPaginate($page=1,$items_per_page=10,$pages_visibles=4){
306
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page);
305
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
306
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
307 307
 		return $this;
308 308
 	}
309 309
 
@@ -313,20 +313,20 @@  discard block
 block discarded – undo
313 313
 	 * @param array $compileParts
314 314
 	 * @return DataTable
315 315
 	 */
316
-	public function refresh($compileParts=["tbody"]){
316
+	public function refresh($compileParts=["tbody"]) {
317 317
 		$this->_compileParts=$compileParts;
318 318
 		return $this;
319 319
 	}
320 320
 
321 321
 
322
-	public function addSearchInToolbar($position=Direction::RIGHT){
322
+	public function addSearchInToolbar($position=Direction::RIGHT) {
323 323
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
324 324
 	}
325 325
 
326
-	public function getSearchField(){
327
-		if(isset($this->_searchField)===false){
328
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
329
-			$this->_searchField->addIcon("search",Direction::RIGHT);
326
+	public function getSearchField() {
327
+		if (isset($this->_searchField)===false) {
328
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
329
+			$this->_searchField->addIcon("search", Direction::RIGHT);
330 330
 		}
331 331
 		return $this->_searchField;
332 332
 	}
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 		return $this;
343 343
 	}
344 344
 
345
-	public function asForm(){
345
+	public function asForm() {
346 346
 		return $this->getForm();
347 347
 	}
348 348
 
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 
351 351
 	protected function getTargetSelector() {
352 352
 		$result=$this->_targetSelector;
353
-		if(!isset($result))
353
+		if (!isset($result))
354 354
 			$result="#".$this->identifier;
355 355
 		return $result;
356 356
 	}
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 	}
367 367
 
368 368
 	public function getRefreshSelector() {
369
-		if(isset($this->_refreshSelector))
369
+		if (isset($this->_refreshSelector))
370 370
 			return $this->_refreshSelector;
371 371
 		return "#".$this->identifier." tbody";
372 372
 	}
@@ -384,9 +384,9 @@  discard block
 block discarded – undo
384 384
 	 * {@inheritDoc}
385 385
 	 * @see \Ajax\common\Widget::show()
386 386
 	 */
387
-	public function show($modelInstance){
388
-		if(\is_array($modelInstance)){
389
-			if(\is_array(array_values($modelInstance)[0]))
387
+	public function show($modelInstance) {
388
+		if (\is_array($modelInstance)) {
389
+			if (\is_array(array_values($modelInstance)[0]))
390 390
 				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
391 391
 		}
392 392
 		$this->_modelInstance=$modelInstance;
@@ -421,24 +421,24 @@  discard block
 block discarded – undo
421 421
 		return $this;
422 422
 	}
423 423
 
424
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
425
-		$this->getTable()->setActiveRowSelector($class,$event,$multiple);
424
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
425
+		$this->getTable()->setActiveRowSelector($class, $event, $multiple);
426 426
 		return $this;
427 427
 	}
428 428
 
429
-	public function hideColumn($colIndex){
430
-		if(!\is_array($this->_hiddenColumns))
429
+	public function hideColumn($colIndex) {
430
+		if (!\is_array($this->_hiddenColumns))
431 431
 			$this->_hiddenColumns=[];
432 432
 		$this->_hiddenColumns[]=$colIndex;
433 433
 		return $this;
434 434
 	}
435 435
 	
436
-	public function setColWidth($colIndex,$width){
436
+	public function setColWidth($colIndex, $width) {
437 437
 		$this->_colWidths[$colIndex]=$width;
438 438
 		return $this;
439 439
 	}
440 440
 	public function setColWidths($_colWidths) {
441
-		$this->_colWidths = $_colWidths;
441
+		$this->_colWidths=$_colWidths;
442 442
 		return $this;
443 443
 	}
444 444
 	
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/FormTrait.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -13,27 +13,27 @@  discard block
 block discarded – undo
13 13
  * @author jc
14 14
  *
15 15
  */
16
-trait FormTrait{
16
+trait FormTrait {
17 17
 
18 18
 	/**
19 19
 	 * @return HtmlForm
20 20
 	 */
21 21
 	abstract protected function getForm();
22 22
 
23
-	protected function addCompoValidation($compo,$field){
23
+	protected function addCompoValidation($compo, $field) {
24 24
 		$validation=$field->getValidation();
25
-		if(isset($validation)){
25
+		if (isset($validation)) {
26 26
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
27 27
 			$compo->addFieldValidation($validation);
28 28
 		}
29 29
 		return $compo;
30 30
 	}
31 31
 
32
-	protected function _runValidationParams(&$compo,JsUtils $js=NULL){
32
+	protected function _runValidationParams(&$compo, JsUtils $js=NULL) {
33 33
 		$form=$this->getForm();
34 34
 		$params=$form->getValidationParams();
35
-		if(isset($params["_ajaxSubmit"])){
36
-			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js);
35
+		if (isset($params["_ajaxSubmit"])) {
36
+			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js);
37 37
 			$this->onSuccess($compilation);
38 38
 			$form->removeValidationParam("_ajaxSubmit");
39 39
 		}
@@ -42,16 +42,16 @@  discard block
 block discarded – undo
42 42
 		$form->addEventsOnRun($js);
43 43
 	}
44 44
 
45
-	protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){
45
+	protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) {
46 46
 		$compilation="";
47
-		if(\is_array($ajaxSubmit)){
48
-			foreach ($ajaxSubmit as $ajaxSubmitItem){
47
+		if (\is_array($ajaxSubmit)) {
48
+			foreach ($ajaxSubmit as $ajaxSubmitItem) {
49 49
 				$compilation.=$ajaxSubmitItem->compile($js);
50 50
 			}
51
-		}elseif($ajaxSubmit instanceof AjaxCall){
51
+		}elseif ($ajaxSubmit instanceof AjaxCall) {
52 52
 			$compilation=$ajaxSubmit->compile($js);
53 53
 		}
54
-		$compilation=str_ireplace("\"","%quote%", $compilation);
54
+		$compilation=str_ireplace("\"", "%quote%", $compilation);
55 55
 		return $compilation;
56 56
 	}
57 57
 
@@ -64,14 +64,14 @@  discard block
 block discarded – undo
64 64
 		return $this;
65 65
 	}
66 66
 
67
-	public function setAttached($value=true){
67
+	public function setAttached($value=true) {
68 68
 		$form=$this->getForm();
69
-		if($value)
70
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
69
+		if ($value)
70
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
71 71
 		return $form;
72 72
 	}
73 73
 
74
-	public function addErrorMessage(){
74
+	public function addErrorMessage() {
75 75
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
76 76
 	}
77 77
 
@@ -87,47 +87,47 @@  discard block
 block discarded – undo
87 87
 	 * @param array $parameters
88 88
 	 * @return HtmlForm
89 89
 	 */
90
-	public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){
90
+	public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) {
91 91
 		$form=$this->getForm();
92
-		if($identifierOrElement  instanceof BaseHtml)
92
+		if ($identifierOrElement  instanceof BaseHtml)
93 93
 			$elem=$identifierOrElement;
94 94
 		else
95 95
 			$elem=$form->getElementById($identifierOrElement, $form->getContent());
96
-		if(isset($elem)){
97
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters);
96
+		if (isset($elem)) {
97
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters);
98 98
 		}
99 99
 		return $form;
100 100
 	}
101 101
 
102
-	public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){
103
-		return $this->submitOn("click", $identifier, $url, $responseElement,$parameters);
102
+	public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) {
103
+		return $this->submitOn("click", $identifier, $url, $responseElement, $parameters);
104 104
 	}
105 105
 
106
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
107
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
108
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters);
106
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
107
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
108
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters);
109 109
 	}
110 110
 
111
-	protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
111
+	protected function _buttonAsSubmit(BaseHtml&$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
112 112
 		$form=$this->getForm();
113
-		if(isset($url) && isset($responseElement)){
114
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
115
-			$this->setSubmitParams($url,$responseElement,$parameters);
113
+		if (isset($url) && isset($responseElement)) {
114
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
115
+			$this->setSubmitParams($url, $responseElement, $parameters);
116 116
 		}
117 117
 		return $button;
118 118
 	}
119 119
 
120
-	public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){
120
+	public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) {
121 121
 		$form=$this->getForm();
122
-		$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
123
-		if(\is_array($parameters))
124
-			$params=\array_merge($params,$parameters);
122
+		$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
123
+		if (\is_array($parameters))
124
+			$params=\array_merge($params, $parameters);
125 125
 		$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
126 126
 		return $this;
127 127
 	}
128 128
 
129
-	public function addReset($identifier,$value,$cssStyle=NULL){
130
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
129
+	public function addReset($identifier, $value, $cssStyle=NULL) {
130
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
131 131
 		$bt->setProperty("type", "reset");
132 132
 		return $bt;
133 133
 	}
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 	 * @param string $jsCode
138 138
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
139 139
 	 */
140
-	public function onValid($jsCode){
140
+	public function onValid($jsCode) {
141 141
 		$form=$this->getForm();
142 142
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
143 143
 		return $form;
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
 	 * @param string $jsCode can use event and fields parameters
149 149
 	 * @return HtmlForm
150 150
 	 */
151
-	public function onSuccess($jsCode){
151
+	public function onSuccess($jsCode) {
152 152
 		$form=$this->getForm();
153
-		$form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%");
153
+		$form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%");
154 154
 		return $form;
155 155
 	}
156 156
 }
157 157
\ No newline at end of file
Please login to merge, or discard this patch.