@@ -9,8 +9,9 @@ |
||
9 | 9 | use TextFieldsTrait; |
10 | 10 | |
11 | 11 | public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
12 | - if(!isset($placeholder) && $type==="text") |
|
13 | - $placeholder=$label; |
|
12 | + if(!isset($placeholder) && $type==="text") { |
|
13 | + $placeholder=$label; |
|
14 | + } |
|
14 | 15 | parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
15 | 16 | } |
16 | 17 |
@@ -23,7 +23,7 @@ |
||
23 | 23 | } |
24 | 24 | if($content instanceof HtmlSemDoubleElement){ |
25 | 25 | $content=new HtmlSemDoubleElement($this->identifier."-".$index,"div","",$content); |
26 | - }elseif ($content instanceof HtmlImg){ |
|
26 | + } elseif ($content instanceof HtmlImg){ |
|
27 | 27 | $this->addToPropertyCtrl("class", "image", array("image")); |
28 | 28 | } |
29 | 29 | $content->addToProperty("class",(($index===0)?"visible":"hidden")." content"); |
@@ -29,12 +29,14 @@ discard block |
||
29 | 29 | if (\is_string($end)) { |
30 | 30 | $label=$end; |
31 | 31 | \array_pop($fields); |
32 | - } else |
|
33 | - $label=NULL; |
|
32 | + } else { |
|
33 | + $label=NULL; |
|
34 | + } |
|
34 | 35 | } |
35 | 36 | } |
36 | - if (isset($label)) |
|
37 | - $this->setLabel($label); |
|
37 | + if (isset($label)) { |
|
38 | + $this->setLabel($label); |
|
39 | + } |
|
38 | 40 | foreach ( $fields as $field ) { |
39 | 41 | $this->addItem($field); |
40 | 42 | } |
@@ -65,8 +67,9 @@ discard block |
||
65 | 67 | if ($this->_equalWidth) { |
66 | 68 | $count=$this->count(); |
67 | 69 | $this->addToProperty("class", Wide::getConstants()["W".$count]." fields"); |
68 | - } else |
|
69 | - $this->addToProperty("class", "fields"); |
|
70 | + } else { |
|
71 | + $this->addToProperty("class", "fields"); |
|
72 | + } |
|
70 | 73 | return parent::compile($js, $view); |
71 | 74 | } |
72 | 75 | |
@@ -106,8 +109,9 @@ discard block |
||
106 | 109 | $fields[]=$itemO; |
107 | 110 | } |
108 | 111 | $radios=new HtmlFormFields("fields-".$name, $fields); |
109 | - if (isset($label)) |
|
110 | - $radios->setLabel($label)->setProperty("for", $name); |
|
112 | + if (isset($label)) { |
|
113 | + $radios->setLabel($label)->setProperty("for", $name); |
|
114 | + } |
|
111 | 115 | return $radios; |
112 | 116 | } |
113 | 117 | |
@@ -122,8 +126,9 @@ discard block |
||
122 | 126 | $fields[]=$itemO; |
123 | 127 | } |
124 | 128 | $radios=new HtmlFormFields("fields-".$name, $fields); |
125 | - if (isset($label)) |
|
126 | - $radios->setLabel($label)->setProperty("for", $name); |
|
129 | + if (isset($label)) { |
|
130 | + $radios->setLabel($label)->setProperty("for", $name); |
|
131 | + } |
|
127 | 132 | return $radios; |
128 | 133 | } |
129 | 134 |
@@ -13,8 +13,9 @@ discard block |
||
13 | 13 | $field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value); |
14 | 14 | $field->setProperty("name", $name); |
15 | 15 | $this->setField($field); |
16 | - if (isset($label)) |
|
17 | - $this->setLabel($label); |
|
16 | + if (isset($label)) { |
|
17 | + $this->setLabel($label); |
|
18 | + } |
|
18 | 19 | } |
19 | 20 | |
20 | 21 | public function setType($checkboxType) { |
@@ -40,8 +41,9 @@ discard block |
||
40 | 41 | * @return mixed |
41 | 42 | */ |
42 | 43 | public function getLabel() { |
43 | - if (\array_key_exists("label", $this->content)) |
|
44 | - return $this->content["label"]; |
|
44 | + if (\array_key_exists("label", $this->content)) { |
|
45 | + return $this->content["label"]; |
|
46 | + } |
|
45 | 47 | } |
46 | 48 | |
47 | 49 | /** |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | } |
56 | 56 | |
57 | 57 | private function afterInsert($item) { |
58 | - if (!$item instanceof HtmlMenu) |
|
59 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
60 | - else { |
|
58 | + if (!$item instanceof HtmlMenu) { |
|
59 | + $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
60 | + } else { |
|
61 | 61 | $this->setSecondary(); |
62 | 62 | } |
63 | 63 | return $item; |
@@ -155,8 +155,9 @@ discard block |
||
155 | 155 | $this->apply(function (HtmlDoubleElement &$item) { |
156 | 156 | $item->setTagName("a"); |
157 | 157 | }); |
158 | - if ($vertical === true) |
|
159 | - $this->setVertical(); |
|
158 | + if ($vertical === true) { |
|
159 | + $this->setVertical(); |
|
160 | + } |
|
160 | 161 | return $this->addToProperty("class", "tabular"); |
161 | 162 | } |
162 | 163 | |
@@ -185,10 +186,11 @@ discard block |
||
185 | 186 | */ |
186 | 187 | public function fromDatabaseObject($object, $function) { |
187 | 188 | $return=$function($object); |
188 | - if (\is_array($return)) |
|
189 | - $this->addItems($return); |
|
190 | - else |
|
191 | - $this->addItem($return); |
|
189 | + if (\is_array($return)) { |
|
190 | + $this->addItems($return); |
|
191 | + } else { |
|
192 | + $this->addItem($return); |
|
193 | + } |
|
192 | 194 | } |
193 | 195 | |
194 | 196 | /** |
@@ -14,21 +14,24 @@ discard block |
||
14 | 14 | return $array[$key]; |
15 | 15 | } |
16 | 16 | $values=array_values($array); |
17 | - if ($pos < sizeof($values)) |
|
18 | - return $values[$pos]; |
|
17 | + if ($pos < sizeof($values)) { |
|
18 | + return $values[$pos]; |
|
19 | + } |
|
19 | 20 | } |
20 | 21 | |
21 | 22 | public static function getConditionalValue($array, $key, $condition) { |
22 | 23 | $result=NULL; |
23 | 24 | if (array_key_exists($key, $array)) { |
24 | 25 | $result=$array[$key]; |
25 | - if ($condition($result) === true) |
|
26 | - return $result; |
|
26 | + if ($condition($result) === true) { |
|
27 | + return $result; |
|
28 | + } |
|
27 | 29 | } |
28 | 30 | $values=array_values($array); |
29 | 31 | foreach ( $values as $val ) { |
30 | - if ($condition($val) === true) |
|
31 | - return $val; |
|
32 | + if ($condition($val) === true) { |
|
33 | + return $val; |
|
34 | + } |
|
32 | 35 | } |
33 | 36 | return $result; |
34 | 37 | } |
@@ -36,8 +39,9 @@ discard block |
||
36 | 39 | public static function getDefaultValue($array, $key, $default=NULL) { |
37 | 40 | if (array_key_exists($key, $array)) { |
38 | 41 | return $array[$key]; |
39 | - } else |
|
40 | - return $default; |
|
42 | + } else { |
|
43 | + return $default; |
|
44 | + } |
|
41 | 45 | } |
42 | 46 | |
43 | 47 | public static function implode($glue, $pieces) { |
@@ -165,8 +165,9 @@ |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | public function setBasic($very=false) { |
168 | - if ($very) |
|
169 | - $this->addToPropertyCtrl("class", "very", array ("very" )); |
|
168 | + if ($very) { |
|
169 | + $this->addToPropertyCtrl("class", "very", array ("very" )); |
|
170 | + } |
|
170 | 171 | return $this->addToPropertyCtrl("class", "basic", array ("basic" )); |
171 | 172 | } |
172 | 173 |
@@ -22,8 +22,9 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
24 | 24 | parent::__construct($identifier, $tagName, ""); |
25 | - if (isset($rowCount) && isset($colCount)) |
|
26 | - $this->setRowCount($rowCount, $colCount); |
|
25 | + if (isset($rowCount) && isset($colCount)) { |
|
26 | + $this->setRowCount($rowCount, $colCount); |
|
27 | + } |
|
27 | 28 | } |
28 | 29 | |
29 | 30 | /** |
@@ -129,8 +130,9 @@ discard block |
||
129 | 130 | $values=\array_fill(0, $count, $values); |
130 | 131 | $isArray=false; |
131 | 132 | } |
132 | - if (JArray::dimension($values) == 1 && $isArray) |
|
133 | - $values=[ $values ]; |
|
133 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
134 | + $values=[ $values ]; |
|
135 | + } |
|
134 | 136 | |
135 | 137 | $count=\min(\sizeof($values), $count); |
136 | 138 | |
@@ -174,8 +176,9 @@ discard block |
||
174 | 176 | $count=$this->count(); |
175 | 177 | for($i=0; $i < $count; $i++) { |
176 | 178 | $index=$this->content[$i]->getColPosition($colIndex); |
177 | - if ($index !== NULL) |
|
178 | - $this->getCell($i, $index)->$function(); |
|
179 | + if ($index !== NULL) { |
|
180 | + $this->getCell($i, $index)->$function(); |
|
181 | + } |
|
179 | 182 | } |
180 | 183 | return $this; |
181 | 184 | } |
@@ -206,8 +209,9 @@ discard block |
||
206 | 209 | */ |
207 | 210 | public function getColCount() { |
208 | 211 | $result=0; |
209 | - if ($this->count() > 0) |
|
210 | - $result=$this->getItem(0)->getColCount(); |
|
212 | + if ($this->count() > 0) { |
|
213 | + $result=$this->getItem(0)->getColCount(); |
|
214 | + } |
|
211 | 215 | return $result; |
212 | 216 | } |
213 | 217 |
@@ -105,17 +105,20 @@ discard block |
||
105 | 105 | $max=\min($colIndex, $rows[$i]->count()); |
106 | 106 | for($j=0; $j < $max; $j++) { |
107 | 107 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
108 | - if ($rowspan + $i > $this->_row) |
|
109 | - $pos++; |
|
108 | + if ($rowspan + $i > $this->_row) { |
|
109 | + $pos++; |
|
110 | + } |
|
110 | 111 | } |
111 | 112 | } |
112 | - if ($pos > $colIndex) |
|
113 | - return NULL; |
|
113 | + if ($pos > $colIndex) { |
|
114 | + return NULL; |
|
115 | + } |
|
114 | 116 | $count=$this->count(); |
115 | 117 | for($i=0; $i < $count; $i++) { |
116 | 118 | $pos+=$this->content[$i]->getColspan(); |
117 | - if ($pos >= $colIndex + 1) |
|
118 | - return $i; |
|
119 | + if ($pos >= $colIndex + 1) { |
|
120 | + return $i; |
|
121 | + } |
|
119 | 122 | } |
120 | 123 | return null; |
121 | 124 | } |
@@ -138,8 +141,9 @@ discard block |
||
138 | 141 | public function containsStr($needle) { |
139 | 142 | $cells=$this->content; |
140 | 143 | foreach ( $cells as $cell ) { |
141 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
142 | - return true; |
|
144 | + if (\strpos($cell->getContent(), $needle) !== false) { |
|
145 | + return true; |
|
146 | + } |
|
143 | 147 | } |
144 | 148 | return false; |
145 | 149 | } |