@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $icon=@$content[0]; |
| 18 | 18 | $title=@$content[1]; |
| 19 | 19 | $desc=@$content[2]; |
| 20 | - }else{ |
|
| 20 | + } else{ |
|
| 21 | 21 | $icon=@$content["icon"]; |
| 22 | 22 | $image=@$content["image"]; |
| 23 | 23 | $title=@$content["title"]; |
@@ -33,20 +33,21 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | if(isset($title)){ |
| 35 | 35 | $this->setTitle($title,$desc); |
| 36 | - }elseif (isset($header)){ |
|
| 36 | + } elseif (isset($header)){ |
|
| 37 | 37 | $this->setTitle($header,$desc,"header"); |
| 38 | 38 | } |
| 39 | 39 | if(isset($items)){ |
| 40 | 40 | $this->addList($items); |
| 41 | 41 | } |
| 42 | - }else{ |
|
| 42 | + } else{ |
|
| 43 | 43 | $this->setContent($content); |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | public function addList($items=array(),$ordered=false) { |
| 47 | 47 | $list=new HtmlList("", $items); |
| 48 | - if($ordered) |
|
| 49 | - $list->setOrdered(); |
|
| 48 | + if($ordered) { |
|
| 49 | + $list->setOrdered(); |
|
| 50 | + } |
|
| 50 | 51 | $list->setClass("list"); |
| 51 | 52 | $this->content["list"]=$list; |
| 52 | 53 | return $list; |
@@ -50,8 +50,9 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | protected function getItemToAdd($item){ |
| 52 | 52 | $itemO=parent::getItemToAdd($item); |
| 53 | - if($itemO instanceof AbstractCheckbox) |
|
| 54 | - $itemO->addClass("item"); |
|
| 53 | + if($itemO instanceof AbstractCheckbox) { |
|
| 54 | + $itemO->addClass("item"); |
|
| 55 | + } |
|
| 55 | 56 | return $itemO; |
| 56 | 57 | } |
| 57 | 58 | |
@@ -106,14 +107,15 @@ discard block |
||
| 106 | 107 | if (isset($masterItem)) { |
| 107 | 108 | if(\is_array($masterItem)){ |
| 108 | 109 | $masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]); |
| 109 | - if(isset($name)) |
|
| 110 | - $masterO->setName($name); |
|
| 110 | + if(isset($name)) { |
|
| 111 | + $masterO->setName($name); |
|
| 112 | + } |
|
| 111 | 113 | if(isset($masterItem[1])){ |
| 112 | 114 | if(\array_search($masterItem[1], $values)!==false){ |
| 113 | 115 | $masterO->getDataField()->setProperty("checked", ""); |
| 114 | 116 | } |
| 115 | 117 | } |
| 116 | - }else{ |
|
| 118 | + } else{ |
|
| 117 | 119 | $masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem); |
| 118 | 120 | } |
| 119 | 121 | if($notAllChecked){ |
@@ -130,8 +132,9 @@ discard block |
||
| 130 | 132 | if (\array_search($val, $values) !== false) { |
| 131 | 133 | $itemO->getDataField()->setProperty("checked", ""); |
| 132 | 134 | } |
| 133 | - if(isset($name)) |
|
| 134 | - $itemO->setName($name); |
|
| 135 | + if(isset($name)) { |
|
| 136 | + $itemO->setName($name); |
|
| 137 | + } |
|
| 135 | 138 | $itemO->setClass("item"); |
| 136 | 139 | $fields[]=$itemO; |
| 137 | 140 | } |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $this->wrapContent("<div class='content'>","</div>"); |
| 52 | 52 | if(\is_string($icon)){ |
| 53 | 53 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
| 54 | - }else{ |
|
| 54 | + } else{ |
|
| 55 | 55 | $this->icon=$icon; |
| 56 | 56 | } |
| 57 | 57 | return $this; |
@@ -64,10 +64,11 @@ discard block |
||
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | public function setDismissable($dismiss=true){ |
| 67 | - if($dismiss===true) |
|
| 68 | - $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
| 69 | - else |
|
| 70 | - $this->close=NULL; |
|
| 67 | + if($dismiss===true) { |
|
| 68 | + $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
| 69 | + } else { |
|
| 70 | + $this->close=NULL; |
|
| 71 | + } |
|
| 71 | 72 | return $this; |
| 72 | 73 | } |
| 73 | 74 | |
@@ -111,8 +112,9 @@ discard block |
||
| 111 | 112 | public function setMessage($message){ |
| 112 | 113 | if(\is_array($this->content)){ |
| 113 | 114 | $this->content[\sizeof($this->content)-1]=$message; |
| 114 | - }else |
|
| 115 | - $this->setContent($message); |
|
| 115 | + } else { |
|
| 116 | + $this->setContent($message); |
|
| 117 | + } |
|
| 116 | 118 | } |
| 117 | 119 | |
| 118 | 120 | } |
@@ -52,8 +52,9 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function addHeader($title, $niveau=1, $dividing=true) { |
| 54 | 54 | $header=new HtmlHeader("", $niveau, $title); |
| 55 | - if ($dividing) |
|
| 56 | - $header->setDividing(); |
|
| 55 | + if ($dividing) { |
|
| 56 | + $header->setDividing(); |
|
| 57 | + } |
|
| 57 | 58 | return $this->addItem($header); |
| 58 | 59 | } |
| 59 | 60 | |
@@ -81,8 +82,9 @@ discard block |
||
| 81 | 82 | if (\is_string($end)) { |
| 82 | 83 | $label=$end; |
| 83 | 84 | \array_pop($fields); |
| 84 | - } else |
|
| 85 | - $label=NULL; |
|
| 85 | + } else { |
|
| 86 | + $label=NULL; |
|
| 87 | + } |
|
| 86 | 88 | } |
| 87 | 89 | $this->_fields=\array_merge($this->_fields, $fields); |
| 88 | 90 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
@@ -146,27 +148,31 @@ discard block |
||
| 146 | 148 | */ |
| 147 | 149 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
| 148 | 150 | $message=new HtmlMessage($identifier, $content); |
| 149 | - if (isset($header)) |
|
| 150 | - $message->addHeader($header); |
|
| 151 | - if (isset($icon)) |
|
| 152 | - $message->setIcon($icon); |
|
| 153 | - if (isset($type)) |
|
| 154 | - $message->setStyle($type); |
|
| 151 | + if (isset($header)) { |
|
| 152 | + $message->addHeader($header); |
|
| 153 | + } |
|
| 154 | + if (isset($icon)) { |
|
| 155 | + $message->setIcon($icon); |
|
| 156 | + } |
|
| 157 | + if (isset($type)) { |
|
| 158 | + $message->setStyle($type); |
|
| 159 | + } |
|
| 155 | 160 | return $this->addItem($message); |
| 156 | 161 | } |
| 157 | 162 | |
| 158 | 163 | |
| 159 | 164 | |
| 160 | 165 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
| 161 | - if(\sizeof($this->_validationParams)>0) |
|
| 162 | - $this->setProperty("novalidate", ""); |
|
| 166 | + if(\sizeof($this->_validationParams)>0) { |
|
| 167 | + $this->setProperty("novalidate", ""); |
|
| 168 | + } |
|
| 163 | 169 | return parent::compile($js,$view); |
| 164 | 170 | } |
| 165 | 171 | |
| 166 | 172 | public function run(JsUtils $js) { |
| 167 | 173 | if(isset($js)){ |
| 168 | 174 | $compo=$js->semantic()->form("#".$this->identifier); |
| 169 | - }else{ |
|
| 175 | + } else{ |
|
| 170 | 176 | $compo=new Form(); |
| 171 | 177 | $compo->attach("#".$this->identifier); |
| 172 | 178 | } |
@@ -179,8 +185,9 @@ discard block |
||
| 179 | 185 | if($field instanceof HtmlFormFields){ |
| 180 | 186 | $items=$field->getItems(); |
| 181 | 187 | foreach ($items as $_field){ |
| 182 | - if($_field instanceof HtmlFormField) |
|
| 183 | - $compo=$this->addCompoValidation($compo, $_field); |
|
| 188 | + if($_field instanceof HtmlFormField) { |
|
| 189 | + $compo=$this->addCompoValidation($compo, $_field); |
|
| 190 | + } |
|
| 184 | 191 | } |
| 185 | 192 | } |
| 186 | 193 | } |
@@ -49,15 +49,16 @@ |
||
| 49 | 49 | * @return Rule |
| 50 | 50 | */ |
| 51 | 51 | public function addRule($type,$prompt=NULL,$value=NULL){ |
| 52 | - if($type instanceof Rule) |
|
| 53 | - $rule=$type; |
|
| 54 | - else if(\is_array($type)){ |
|
| 52 | + if($type instanceof Rule) { |
|
| 53 | + $rule=$type; |
|
| 54 | + } else if(\is_array($type)){ |
|
| 55 | 55 | $value=JArray::getValue($type, "value", 2); |
| 56 | 56 | $prompt=JArray::getValue($type, "prompt", 1); |
| 57 | 57 | $type=JArray::getValue($type, "type", 0); |
| 58 | 58 | $rule=new Rule($type,$prompt,$value); |
| 59 | - }else |
|
| 60 | - $rule=new Rule($type,$prompt,$value); |
|
| 59 | + } else { |
|
| 60 | + $rule=new Rule($type,$prompt,$value); |
|
| 61 | + } |
|
| 61 | 62 | $this->rules[]=$rule; |
| 62 | 63 | return $rule; |
| 63 | 64 | } |
@@ -14,8 +14,9 @@ |
||
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | public function compile(JsUtils $js=null) { |
| 17 | - if ($js===null) |
|
| 18 | - return; |
|
| 17 | + if ($js===null) { |
|
| 18 | + return; |
|
| 19 | + } |
|
| 19 | 20 | $params="{}"; |
| 20 | 21 | $stopPropagation=true; |
| 21 | 22 | $preventDefault=true; |
@@ -25,8 +25,9 @@ |
||
| 25 | 25 | |
| 26 | 26 | private static function containsElement($input) { |
| 27 | 27 | foreach ( $input as $v ) { |
| 28 | - if (\is_object($v) || \is_array($v)) |
|
| 29 | - return true; |
|
| 28 | + if (\is_object($v) || \is_array($v)) { |
|
| 29 | + return true; |
|
| 30 | + } |
|
| 30 | 31 | } |
| 31 | 32 | return false; |
| 32 | 33 | } |
@@ -120,25 +120,29 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | public function getColPosition($colIndex) { |
| 123 | - if($this->_container->_isMerged()!==true) |
|
| 124 | - return $colIndex; |
|
| 123 | + if($this->_container->_isMerged()!==true) { |
|
| 124 | + return $colIndex; |
|
| 125 | + } |
|
| 125 | 126 | $pos=0; |
| 126 | 127 | $rows=$this->_container->getContent(); |
| 127 | 128 | for($i=0; $i < $this->_row; $i++) { |
| 128 | 129 | $max=\min($colIndex, $rows[$i]->count()); |
| 129 | 130 | for($j=0; $j < $max; $j++) { |
| 130 | 131 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
| 131 | - if ($rowspan + $i > $this->_row) |
|
| 132 | - $pos++; |
|
| 132 | + if ($rowspan + $i > $this->_row) { |
|
| 133 | + $pos++; |
|
| 134 | + } |
|
| 133 | 135 | } |
| 134 | 136 | } |
| 135 | - if ($pos > $colIndex) |
|
| 136 | - return NULL; |
|
| 137 | + if ($pos > $colIndex) { |
|
| 138 | + return NULL; |
|
| 139 | + } |
|
| 137 | 140 | $count=$this->count(); |
| 138 | 141 | for($i=0; $i < $count; $i++) { |
| 139 | 142 | $pos+=$this->content[$i]->getColspan(); |
| 140 | - if ($pos >= $colIndex + 1) |
|
| 141 | - return $i; |
|
| 143 | + if ($pos >= $colIndex + 1) { |
|
| 144 | + return $i; |
|
| 145 | + } |
|
| 142 | 146 | } |
| 143 | 147 | return null; |
| 144 | 148 | } |
@@ -161,8 +165,9 @@ discard block |
||
| 161 | 165 | public function containsStr($needle) { |
| 162 | 166 | $cells=$this->content; |
| 163 | 167 | foreach ( $cells as $cell ) { |
| 164 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
| 165 | - return true; |
|
| 168 | + if (\strpos($cell->getContent(), $needle) !== false) { |
|
| 169 | + return true; |
|
| 170 | + } |
|
| 166 | 171 | } |
| 167 | 172 | return false; |
| 168 | 173 | } |
@@ -43,8 +43,7 @@ discard block |
||
| 43 | 43 | foreach ($actions as $action){ |
| 44 | 44 | $this->addAction($action); |
| 45 | 45 | } |
| 46 | - } |
|
| 47 | - else{ |
|
| 46 | + } else{ |
|
| 48 | 47 | $this->addAction($actions); |
| 49 | 48 | } |
| 50 | 49 | return $this; |
@@ -64,8 +63,9 @@ discard block |
||
| 64 | 63 | $class="cancel"; |
| 65 | 64 | } |
| 66 | 65 | $action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()),$action); |
| 67 | - if($class!=="") |
|
| 68 | - $action->addToProperty("class", $class); |
|
| 66 | + if($class!=="") { |
|
| 67 | + $action->addToProperty("class", $class); |
|
| 68 | + } |
|
| 69 | 69 | } |
| 70 | 70 | return $this->addElementInPart($action, "actions"); |
| 71 | 71 | } |
@@ -174,8 +174,9 @@ discard block |
||
| 174 | 174 | * @see BaseHtml::run() |
| 175 | 175 | */ |
| 176 | 176 | public function run(JsUtils $js) { |
| 177 | - if(isset($this->_bsComponent)===false) |
|
| 178 | - $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
| 177 | + if(isset($this->_bsComponent)===false) { |
|
| 178 | + $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
| 179 | + } |
|
| 179 | 180 | $this->addEventsOnRun($js); |
| 180 | 181 | return $this->_bsComponent; |
| 181 | 182 | } |