@@ -109,15 +109,18 @@ discard block |
||
109 | 109 | $flag=false; |
110 | 110 | $index=0; |
111 | 111 | while ( !$flag && $index < sizeof($elements) ) { |
112 | - if ($elements[$index] instanceof BaseHtml) |
|
113 | - $flag=($callback($elements[$index])); |
|
112 | + if ($elements[$index] instanceof BaseHtml) { |
|
113 | + $flag=($callback($elements[$index])); |
|
114 | + } |
|
114 | 115 | $index++; |
115 | 116 | } |
116 | - if ($flag === true) |
|
117 | - return $elements[$index - 1]; |
|
117 | + if ($flag === true) { |
|
118 | + return $elements[$index - 1]; |
|
119 | + } |
|
118 | 120 | } elseif ($elements instanceof BaseHtml) { |
119 | - if ($callback($elements)) |
|
120 | - return $elements; |
|
121 | + if ($callback($elements)) { |
|
122 | + return $elements; |
|
123 | + } |
|
121 | 124 | } |
122 | 125 | return null; |
123 | 126 | } |
@@ -143,8 +146,9 @@ discard block |
||
143 | 146 | |
144 | 147 | public function fromArray($array) { |
145 | 148 | foreach ( $this as $key => $value ) { |
146 | - if(array_key_exists($key, $array)===true) |
|
147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
149 | + if(array_key_exists($key, $array)===true) { |
|
150 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
151 | + } |
|
148 | 152 | } |
149 | 153 | foreach ( $array as $key => $value ) { |
150 | 154 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -213,11 +217,11 @@ discard block |
||
213 | 217 | if(\strstr($result, "%{$key}%")!==false){ |
214 | 218 | if (\is_array($value)) { |
215 | 219 | $v=PropertyWrapper::wrap($value, $js,$view); |
216 | - }elseif($value instanceof \stdClass){ |
|
220 | + } elseif($value instanceof \stdClass){ |
|
217 | 221 | $v=\print_r($value,true); |
218 | - }elseif ($value instanceof BaseHtml){ |
|
222 | + } elseif ($value instanceof BaseHtml){ |
|
219 | 223 | $v=$value->compile($js,$view); |
220 | - }else{ |
|
224 | + } else{ |
|
221 | 225 | $v=$value; |
222 | 226 | } |
223 | 227 | $result=str_replace("%{$key}%", $v, $result); |
@@ -345,8 +345,9 @@ discard block |
||
345 | 345 | $result= $this->getBody()->_addRow($result); |
346 | 346 | } |
347 | 347 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
348 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
349 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
348 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
349 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
350 | + } |
|
350 | 351 | } |
351 | 352 | return $result; |
352 | 353 | } |
@@ -375,8 +376,9 @@ discard block |
||
375 | 376 | } |
376 | 377 | } |
377 | 378 | $result= parent::run($js); |
378 | - if(isset($this->_footer)) |
|
379 | - $this->_footer->run($js); |
|
379 | + if(isset($this->_footer)) { |
|
380 | + $this->_footer->run($js); |
|
381 | + } |
|
380 | 382 | $this->_runned=true; |
381 | 383 | return $result; |
382 | 384 | } |
@@ -417,8 +419,9 @@ discard block |
||
417 | 419 | |
418 | 420 | public function setColWidth($colIndex,$width){ |
419 | 421 | $part=$this->_getFirstPart(); |
420 | - if($part!==null && $part->count()>0) |
|
421 | - $part->getCell(0, $colIndex)->setWidth($width); |
|
422 | + if($part!==null && $part->count()>0) { |
|
423 | + $part->getCell(0, $colIndex)->setWidth($width); |
|
424 | + } |
|
422 | 425 | return $this; |
423 | 426 | } |
424 | 427 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | foreach ($items as $k=>$v){ |
25 | 25 | $this->addItem([$k,$v]); |
26 | 26 | } |
27 | - }else{ |
|
27 | + } else{ |
|
28 | 28 | foreach ($items as $item){ |
29 | 29 | $this->addItem($item); |
30 | 30 | } |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | * @return \Ajax\common\html\HtmlDoubleElement |
81 | 81 | */ |
82 | 82 | public function getItem($index) { |
83 | - if (is_int($index)&& isset($this->content[$index])) |
|
84 | - return $this->content[$index]; |
|
85 | - else { |
|
83 | + if (is_int($index)&& isset($this->content[$index])) { |
|
84 | + return $this->content[$index]; |
|
85 | + } else { |
|
86 | 86 | $elm=$this->getElementById($index, $this->content); |
87 | 87 | return $elm; |
88 | 88 | } |
@@ -144,10 +144,11 @@ discard block |
||
144 | 144 | $i=0; |
145 | 145 | foreach ($properties as $k=>$v){ |
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
149 | - else |
|
150 | - return $this; |
|
147 | + if(isset($c)) { |
|
148 | + $c->setProperty($k,$v); |
|
149 | + } else { |
|
150 | + return $this; |
|
151 | + } |
|
151 | 152 | } |
152 | 153 | return $this; |
153 | 154 | } |
@@ -165,8 +166,7 @@ discard block |
||
165 | 166 | foreach ($values as $i=>$value){ |
166 | 167 | if(isset($this->content[$i])){ |
167 | 168 | $this->content[$i]->setProperty($property,$value); |
168 | - } |
|
169 | - else{ |
|
169 | + } else{ |
|
170 | 170 | return $this; |
171 | 171 | } |
172 | 172 | } |
@@ -186,8 +186,7 @@ discard block |
||
186 | 186 | foreach ($values as $i=>$value){ |
187 | 187 | if(isset($this->content[$i])){ |
188 | 188 | $this->content[$i++]->addToProperty($property,$value); |
189 | - } |
|
190 | - else{ |
|
189 | + } else{ |
|
191 | 190 | return $this; |
192 | 191 | } |
193 | 192 | } |
@@ -216,8 +215,9 @@ discard block |
||
216 | 215 | foreach ( $this->content as $index=>$item ) { |
217 | 216 | if($item instanceof HtmlDoubleElement){ |
218 | 217 | $href=""; |
219 | - if(isset($hrefs[$index])) |
|
220 | - $href=$hrefs[$index]; |
|
218 | + if(isset($hrefs[$index])) { |
|
219 | + $href=$hrefs[$index]; |
|
220 | + } |
|
221 | 221 | $item->asLink($href,$target); |
222 | 222 | } |
223 | 223 | } |
@@ -33,8 +33,9 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | public function getProperty($name) { |
36 | - if (array_key_exists($name, $this->_self->properties)) |
|
37 | - return $this->_self->properties[$name]; |
|
36 | + if (array_key_exists($name, $this->_self->properties)) { |
|
37 | + return $this->_self->properties[$name]; |
|
38 | + } |
|
38 | 39 | } |
39 | 40 | |
40 | 41 | /** |
@@ -76,8 +77,9 @@ discard block |
||
76 | 77 | } |
77 | 78 | |
78 | 79 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
79 | - if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) |
|
80 | - $typeCtrl=$typeCtrl::getConstants(); |
|
80 | + if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) { |
|
81 | + $typeCtrl=$typeCtrl::getConstants(); |
|
82 | + } |
|
81 | 83 | if (\is_array($typeCtrl)) { |
82 | 84 | $this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl); |
83 | 85 | } |
@@ -96,8 +98,9 @@ discard block |
||
96 | 98 | } |
97 | 99 | |
98 | 100 | public function removeProperty($name) { |
99 | - if (\array_key_exists($name, $this->_self->properties)) |
|
100 | - unset($this->_self->properties[$name]); |
|
101 | + if (\array_key_exists($name, $this->_self->properties)) { |
|
102 | + unset($this->_self->properties[$name]); |
|
103 | + } |
|
101 | 104 | return $this; |
102 | 105 | } |
103 | 106 | |
@@ -110,8 +113,9 @@ discard block |
||
110 | 113 | } |
111 | 114 | |
112 | 115 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
113 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
114 | - return $this->_self->setProperty($name, $value); |
|
116 | + if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
117 | + return $this->_self->setProperty($name, $value); |
|
118 | + } |
|
115 | 119 | return $this; |
116 | 120 | } |
117 | 121 |
@@ -59,8 +59,9 @@ |
||
59 | 59 | $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
60 | 60 | $callback.=$this->_generatePaginationScript($id); |
61 | 61 | if(isset($this->_urls["refresh"])){ |
62 | - if(isset($menu)) |
|
63 | - $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
62 | + if(isset($menu)) { |
|
63 | + $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
64 | + } |
|
64 | 65 | } |
65 | 66 | } |
66 | 67 |
@@ -79,8 +79,9 @@ discard block |
||
79 | 79 | $actionO=$action; |
80 | 80 | if (\is_object($action) === false) { |
81 | 81 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
82 | - if (isset($icon)) |
|
83 | - $actionO->addIcon($icon, true, $labeled); |
|
82 | + if (isset($icon)) { |
|
83 | + $actionO->addIcon($icon, true, $labeled); |
|
84 | + } |
|
84 | 85 | } |
85 | 86 | $field->addToProperty("class", $direction . " action"); |
86 | 87 | $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -120,8 +121,9 @@ discard block |
||
120 | 121 | |
121 | 122 | public function setDisabled($disable=true) { |
122 | 123 | $field=$this->getField(); |
123 | - if($disable) |
|
124 | - $field->addToProperty("class", "disabled"); |
|
124 | + if($disable) { |
|
125 | + $field->addToProperty("class", "disabled"); |
|
126 | + } |
|
125 | 127 | return $this; |
126 | 128 | } |
127 | 129 |
@@ -29,11 +29,12 @@ discard block |
||
29 | 29 | if(\is_array($value)){ |
30 | 30 | $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
31 | 31 | return $itemO; |
32 | - }elseif(\is_object($value)){ |
|
32 | + } elseif(\is_object($value)){ |
|
33 | 33 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
34 | 34 | return $itemO; |
35 | - }else |
|
36 | - return new HtmlFormInput($value); |
|
35 | + } else { |
|
36 | + return new HtmlFormInput($value); |
|
37 | + } |
|
37 | 38 | } |
38 | 39 | |
39 | 40 | protected function createCondition($value){ |
@@ -67,8 +68,7 @@ discard block |
||
67 | 68 | if(isset($c)){ |
68 | 69 | $df=$c->getDataField(); |
69 | 70 | $df->setProperty($property,$value); |
70 | - } |
|
71 | - else{ |
|
71 | + } else{ |
|
72 | 72 | return $this; |
73 | 73 | } |
74 | 74 | } |
@@ -163,10 +163,12 @@ discard block |
||
163 | 163 | public function addButtonIcon($identifier,$icon,$cssStyle=NULL,$onClick=NULL){ |
164 | 164 | $bt=new HtmlButton($identifier); |
165 | 165 | $bt->asIcon($icon); |
166 | - if(isset($onClick)) |
|
167 | - $bt->onClick($onClick); |
|
168 | - if (isset($cssStyle)) |
|
169 | - $bt->addClass($cssStyle); |
|
166 | + if(isset($onClick)) { |
|
167 | + $bt->onClick($onClick); |
|
168 | + } |
|
169 | + if (isset($cssStyle)) { |
|
170 | + $bt->addClass($cssStyle); |
|
171 | + } |
|
170 | 172 | return $this->addItem($bt); |
171 | 173 | } |
172 | 174 |
@@ -35,8 +35,9 @@ |
||
35 | 35 | */ |
36 | 36 | public function htmlMessage($identifier, $content="",$styles=NULL) { |
37 | 37 | $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
38 | - if(isset($msg) && $styles!==null) |
|
39 | - $msg->setStyle($styles); |
|
38 | + if(isset($msg) && $styles!==null) { |
|
39 | + $msg->setStyle($styles); |
|
40 | + } |
|
40 | 41 | return $msg; |
41 | 42 | } |
42 | 43 |
@@ -58,8 +58,9 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function addHeader($title, $niveau=1, $dividing=true) { |
60 | 60 | $header=new HtmlHeader("", $niveau, $title); |
61 | - if ($dividing) |
|
62 | - $header->setDividing(); |
|
61 | + if ($dividing) { |
|
62 | + $header->setDividing(); |
|
63 | + } |
|
63 | 64 | return $this->addItem($header); |
64 | 65 | } |
65 | 66 | |
@@ -87,8 +88,9 @@ discard block |
||
87 | 88 | if (\is_string($end)) { |
88 | 89 | $label=$end; |
89 | 90 | \array_pop($fields); |
90 | - } else |
|
91 | - $label=NULL; |
|
91 | + } else { |
|
92 | + $label=NULL; |
|
93 | + } |
|
92 | 94 | } |
93 | 95 | $this->_fields=\array_merge($this->_fields, $fields); |
94 | 96 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
@@ -152,27 +154,31 @@ discard block |
||
152 | 154 | */ |
153 | 155 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
154 | 156 | $message=new HtmlMessage($identifier, $content); |
155 | - if (isset($header)) |
|
156 | - $message->addHeader($header); |
|
157 | - if (isset($icon)) |
|
158 | - $message->setIcon($icon); |
|
159 | - if (isset($type)) |
|
160 | - $message->setStyle($type); |
|
157 | + if (isset($header)) { |
|
158 | + $message->addHeader($header); |
|
159 | + } |
|
160 | + if (isset($icon)) { |
|
161 | + $message->setIcon($icon); |
|
162 | + } |
|
163 | + if (isset($type)) { |
|
164 | + $message->setStyle($type); |
|
165 | + } |
|
161 | 166 | return $this->addItem($message); |
162 | 167 | } |
163 | 168 | |
164 | 169 | |
165 | 170 | |
166 | 171 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
167 | - if(\sizeof($this->_validationParams)>0) |
|
168 | - $this->setProperty("novalidate", ""); |
|
172 | + if(\sizeof($this->_validationParams)>0) { |
|
173 | + $this->setProperty("novalidate", ""); |
|
174 | + } |
|
169 | 175 | return parent::compile($js,$view); |
170 | 176 | } |
171 | 177 | |
172 | 178 | public function run(JsUtils $js) { |
173 | 179 | if(isset($js)){ |
174 | 180 | $compo=$js->semantic()->form("#".$this->identifier); |
175 | - }else{ |
|
181 | + } else{ |
|
176 | 182 | $compo=new Form(); |
177 | 183 | $compo->attach("#".$this->identifier); |
178 | 184 | } |
@@ -185,8 +191,9 @@ discard block |
||
185 | 191 | if($field instanceof HtmlFormFields){ |
186 | 192 | $items=$field->getItems(); |
187 | 193 | foreach ($items as $_field){ |
188 | - if($_field instanceof HtmlFormField) |
|
189 | - $this->addCompoValidation($compo, $_field); |
|
194 | + if($_field instanceof HtmlFormField) { |
|
195 | + $this->addCompoValidation($compo, $_field); |
|
196 | + } |
|
190 | 197 | } |
191 | 198 | } |
192 | 199 | } |