@@ -50,8 +50,9 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | public function addHeader($title, $niveau=1, $dividing=true) { |
| 52 | 52 | $header=new HtmlHeader("", $niveau, $title); |
| 53 | - if ($dividing) |
|
| 54 | - $header->setDividing(); |
|
| 53 | + if ($dividing) { |
|
| 54 | + $header->setDividing(); |
|
| 55 | + } |
|
| 55 | 56 | return $this->addItem($header); |
| 56 | 57 | } |
| 57 | 58 | |
@@ -72,14 +73,16 @@ discard block |
||
| 72 | 73 | if (\is_string($end)) { |
| 73 | 74 | $label=$end; |
| 74 | 75 | \array_pop($fields); |
| 75 | - } else |
|
| 76 | - $label=NULL; |
|
| 76 | + } else { |
|
| 77 | + $label=NULL; |
|
| 78 | + } |
|
| 77 | 79 | } |
| 78 | 80 | $this->_fields=\array_merge($this->_fields, $fields); |
| 79 | 81 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
| 80 | 82 | } |
| 81 | - if (isset($label)) |
|
| 82 | - $fields=new HtmlFormField("", $fields, $label); |
|
| 83 | + if (isset($label)) { |
|
| 84 | + $fields=new HtmlFormField("", $fields, $label); |
|
| 85 | + } |
|
| 83 | 86 | } else { |
| 84 | 87 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
| 85 | 88 | } |
@@ -132,35 +135,41 @@ discard block |
||
| 132 | 135 | */ |
| 133 | 136 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
| 134 | 137 | $message=new HtmlMessage($identifier, $content); |
| 135 | - if (isset($header)) |
|
| 136 | - $message->addHeader($header); |
|
| 137 | - if (isset($icon)) |
|
| 138 | - $message->setIcon($icon); |
|
| 139 | - if (isset($type)) |
|
| 140 | - $message->setStyle($type); |
|
| 138 | + if (isset($header)) { |
|
| 139 | + $message->addHeader($header); |
|
| 140 | + } |
|
| 141 | + if (isset($icon)) { |
|
| 142 | + $message->setIcon($icon); |
|
| 143 | + } |
|
| 144 | + if (isset($type)) { |
|
| 145 | + $message->setStyle($type); |
|
| 146 | + } |
|
| 141 | 147 | return $this->addItem($message); |
| 142 | 148 | } |
| 143 | 149 | |
| 144 | 150 | |
| 145 | 151 | |
| 146 | 152 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
| 147 | - if(\sizeof($this->_validationParams)>0) |
|
| 148 | - $this->setProperty("novalidate", ""); |
|
| 153 | + if(\sizeof($this->_validationParams)>0) { |
|
| 154 | + $this->setProperty("novalidate", ""); |
|
| 155 | + } |
|
| 149 | 156 | return parent::compile($js,$view); |
| 150 | 157 | } |
| 151 | 158 | |
| 152 | 159 | public function run(JsUtils $js) { |
| 153 | 160 | $compo=NULL; |
| 154 | 161 | foreach ($this->_fields as $field){ |
| 155 | - if($field instanceof HtmlFormField) |
|
| 156 | - $compo=$this->addCompoValidation($js, $compo, $field); |
|
| 162 | + if($field instanceof HtmlFormField) { |
|
| 163 | + $compo=$this->addCompoValidation($js, $compo, $field); |
|
| 164 | + } |
|
| 157 | 165 | } |
| 158 | 166 | foreach ($this->content as $field){ |
| 159 | 167 | if($field instanceof HtmlFormFields){ |
| 160 | 168 | $items=$field->getItems(); |
| 161 | 169 | foreach ($items as $_field){ |
| 162 | - if($_field instanceof HtmlFormField) |
|
| 163 | - $compo=$this->addCompoValidation($js, $compo, $_field); |
|
| 170 | + if($_field instanceof HtmlFormField) { |
|
| 171 | + $compo=$this->addCompoValidation($js, $compo, $_field); |
|
| 172 | + } |
|
| 164 | 173 | } |
| 165 | 174 | } |
| 166 | 175 | } |
@@ -51,14 +51,14 @@ |
||
| 51 | 51 | foreach ($values as $v){ |
| 52 | 52 | $form->addField($v); |
| 53 | 53 | } |
| 54 | - }else{ |
|
| 54 | + } else{ |
|
| 55 | 55 | $separators[]=$count; |
| 56 | 56 | for($i=0;$i<$size;$i++){ |
| 57 | 57 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
| 58 | 58 | //TODO check why $fields is empty |
| 59 | 59 | if(\sizeof($fields)===1){ |
| 60 | 60 | $form->addField($fields[0]); |
| 61 | - }elseif(\sizeof($fields)>1){ |
|
| 61 | + } elseif(\sizeof($fields)>1){ |
|
| 62 | 62 | $form->addFields($fields,"grouped"); |
| 63 | 63 | $i+=\sizeof($fields)-1; |
| 64 | 64 | } |