@@ -288,8 +288,9 @@ discard block |
||
| 288 | 288 | */ |
| 289 | 289 | public function addItemInToolbar($caption, $icon = NULL, $callback = NULL) { |
| 290 | 290 | $result = $this->addInToolbar($caption, $callback); |
| 291 | - if (isset($icon) && method_exists($result, "addIcon")) |
|
| 292 | - $result->addIcon($icon); |
|
| 291 | + if (isset($icon) && method_exists($result, "addIcon")) { |
|
| 292 | + $result->addIcon($icon); |
|
| 293 | + } |
|
| 293 | 294 | return $result; |
| 294 | 295 | } |
| 295 | 296 | |
@@ -478,8 +479,9 @@ discard block |
||
| 478 | 479 | protected function _compileForm() { |
| 479 | 480 | if (isset($this->_form)) { |
| 480 | 481 | $noValidate = ""; |
| 481 | - if (\sizeof($this->_form->getValidationParams()) > 0) |
|
| 482 | - $noValidate = "novalidate"; |
|
| 482 | + if (\sizeof($this->_form->getValidationParams()) > 0) { |
|
| 483 | + $noValidate = "novalidate"; |
|
| 484 | + } |
|
| 483 | 485 | $this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>"); |
| 484 | 486 | } |
| 485 | 487 | } |
@@ -62,12 +62,12 @@ |
||
| 62 | 62 | $this->customRules[]=$type; |
| 63 | 63 | $this->hasCustomRules=true; |
| 64 | 64 | } |
| 65 | - }elseif(\is_array($type)){ |
|
| 65 | + } elseif(\is_array($type)){ |
|
| 66 | 66 | $value=JArray::getValue($type, "value", 2); |
| 67 | 67 | $prompt=JArray::getValue($type, "prompt", 1); |
| 68 | 68 | $type=JArray::getValue($type, "type", 0); |
| 69 | 69 | $rule=new Rule($type,$prompt,$value); |
| 70 | - }else { |
|
| 70 | + } else { |
|
| 71 | 71 | $rule = new Rule($type, $prompt, $value); |
| 72 | 72 | } |
| 73 | 73 | $this->rules[]=$rule; |
@@ -35,17 +35,19 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | public function addContent($content, $before = false) { |
| 37 | 37 | if (! \is_array($this->content)) { |
| 38 | - if (isset($this->content)) |
|
| 39 | - $this->content = array( |
|
| 38 | + if (isset($this->content)) { |
|
| 39 | + $this->content = array( |
|
| 40 | 40 | $this->content |
| 41 | 41 | ); |
| 42 | - else |
|
| 43 | - $this->content = array(); |
|
| 42 | + } else { |
|
| 43 | + $this->content = array(); |
|
| 44 | + } |
|
| 45 | + } |
|
| 46 | + if ($before) { |
|
| 47 | + \array_unshift($this->content, $content); |
|
| 48 | + } else { |
|
| 49 | + $this->content[] = $content; |
|
| 44 | 50 | } |
| 45 | - if ($before) |
|
| 46 | - \array_unshift($this->content, $content); |
|
| 47 | - else |
|
| 48 | - $this->content[] = $content; |
|
| 49 | 51 | return $this; |
| 50 | 52 | } |
| 51 | 53 | |
@@ -108,10 +110,12 @@ discard block |
||
| 108 | 110 | * @return HtmlDoubleElement |
| 109 | 111 | */ |
| 110 | 112 | public function asLink($href = NULL, $target = NULL) { |
| 111 | - if (isset($href)) |
|
| 112 | - $this->setProperty("href", $href); |
|
| 113 | - if (isset($target)) |
|
| 114 | - $this->setProperty("target", $target); |
|
| 113 | + if (isset($href)) { |
|
| 114 | + $this->setProperty("href", $href); |
|
| 115 | + } |
|
| 116 | + if (isset($target)) { |
|
| 117 | + $this->setProperty("target", $target); |
|
| 118 | + } |
|
| 115 | 119 | return $this->setTagName("a"); |
| 116 | 120 | } |
| 117 | 121 | |
@@ -73,8 +73,9 @@ discard block |
||
| 73 | 73 | $retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null)) . "});\n"; |
| 74 | 74 | |
| 75 | 75 | $retour = $this->_addJsCondition($jsCondition, $retour); |
| 76 | - if ($immediatly) |
|
| 77 | - $this->jquery_code_for_compile[] = $retour; |
|
| 76 | + if ($immediatly) { |
|
| 77 | + $this->jquery_code_for_compile[] = $retour; |
|
| 78 | + } |
|
| 78 | 79 | return $retour; |
| 79 | 80 | } |
| 80 | 81 | |
@@ -157,10 +158,11 @@ discard block |
||
| 157 | 158 | } elseif (isset($this->ajaxTransition)) { |
| 158 | 159 | $call = $this->ajaxTransition; |
| 159 | 160 | } |
| 160 | - if (\is_callable($call)) |
|
| 161 | - $retour = "\t" . $call($responseElement, $jqueryDone) . ";\n"; |
|
| 162 | - else |
|
| 163 | - $retour = "\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 161 | + if (\is_callable($call)) { |
|
| 162 | + $retour = "\t" . $call($responseElement, $jqueryDone) . ";\n"; |
|
| 163 | + } else { |
|
| 164 | + $retour = "\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 165 | + } |
|
| 164 | 166 | } |
| 165 | 167 | if (isset($history)) { |
| 166 | 168 | if ($this->params["autoActiveLinks"]) { |
@@ -194,8 +196,9 @@ discard block |
||
| 194 | 196 | } |
| 195 | 197 | |
| 196 | 198 | protected function _correctAjaxUrl($url) { |
| 197 | - if ($url !== "/" && JString::endsWith($url, "/") === true) |
|
| 198 | - $url = substr($url, 0, strlen($url) - 1); |
|
| 199 | + if ($url !== "/" && JString::endsWith($url, "/") === true) { |
|
| 200 | + $url = substr($url, 0, strlen($url) - 1); |
|
| 201 | + } |
|
| 199 | 202 | if (strncmp($url, 'http://', 7) != 0 && strncmp($url, 'https://', 8) != 0) { |
| 200 | 203 | $url = $this->getUrl($url); |
| 201 | 204 | } |
@@ -219,8 +222,9 @@ discard block |
||
| 219 | 222 | public static function _implodeParams($parameters) { |
| 220 | 223 | $allParameters = []; |
| 221 | 224 | foreach ($parameters as $params) { |
| 222 | - if (isset($params)) |
|
| 223 | - $allParameters[] = self::_correctParams($params); |
|
| 225 | + if (isset($params)) { |
|
| 226 | + $allParameters[] = self::_correctParams($params); |
|
| 227 | + } |
|
| 224 | 228 | } |
| 225 | 229 | return \implode("+'&'+", $allParameters); |
| 226 | 230 | } |
@@ -254,8 +258,9 @@ discard block |
||
| 254 | 258 | |
| 255 | 259 | protected function setDefaultParameters(&$parameters, $default) { |
| 256 | 260 | foreach ($default as $k => $v) { |
| 257 | - if (! isset($parameters[$k])) |
|
| 258 | - $parameters[$k] = $v; |
|
| 261 | + if (! isset($parameters[$k])) { |
|
| 262 | + $parameters[$k] = $v; |
|
| 263 | + } |
|
| 259 | 264 | } |
| 260 | 265 | } |
| 261 | 266 | |
@@ -820,8 +825,9 @@ discard block |
||
| 820 | 825 | $retour .= "$('#'+" . $form . ").submit();\n"; |
| 821 | 826 | } |
| 822 | 827 | $retour = $this->_addJsCondition($jsCondition, $retour); |
| 823 | - if ($immediatly) |
|
| 824 | - $this->jquery_code_for_compile[] = $retour; |
|
| 828 | + if ($immediatly) { |
|
| 829 | + $this->jquery_code_for_compile[] = $retour; |
|
| 830 | + } |
|
| 825 | 831 | return $retour; |
| 826 | 832 | } |
| 827 | 833 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | $this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++,$names[$k]??''); |
| 72 | 72 | $i++; |
| 73 | 73 | } |
| 74 | - }else{ |
|
| 74 | + } else{ |
|
| 75 | 75 | $separators[]=$count; |
| 76 | 76 | for($i=0;$i<$size;$i++){ |
| 77 | 77 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
@@ -85,18 +85,20 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb, $name){ |
| 87 | 87 | $wrapper=null; |
| 88 | - if(isset($headers[$sepFirst+1])) |
|
| 89 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 88 | + if(isset($headers[$sepFirst+1])) { |
|
| 89 | + $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 90 | + } |
|
| 90 | 91 | if(isset($wrappers[$sepFirst+1])){ |
| 91 | 92 | $wrapper=$wrappers[$sepFirst+1]; |
| 92 | 93 | } |
| 93 | 94 | $count=\count($values); |
| 94 | 95 | if($count===1){ |
| 95 | 96 | $added=$form->addField($values[0]); |
| 96 | - }elseif($count>1){ |
|
| 97 | + } elseif($count>1){ |
|
| 97 | 98 | $added=$form->addFields($values); |
| 98 | - }else |
|
| 99 | - return; |
|
| 99 | + } else { |
|
| 100 | + return; |
|
| 101 | + } |
|
| 100 | 102 | if(isset($wrapper)){ |
| 101 | 103 | $added->wrap($wrapper[0],$wrapper[1]); |
| 102 | 104 | } |
@@ -66,8 +66,9 @@ |
||
| 66 | 66 | $actionO = $action; |
| 67 | 67 | if (\is_object($action) === false) { |
| 68 | 68 | $actionO = new HtmlButton("action-" . $this->identifier, $action); |
| 69 | - if (isset($icon)) |
|
| 70 | - $actionO->addIcon($icon, true, $labeled); |
|
| 69 | + if (isset($icon)) { |
|
| 70 | + $actionO->addIcon($icon, true, $labeled); |
|
| 71 | + } |
|
| 71 | 72 | } |
| 72 | 73 | $this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
| 73 | 74 | return $actionO; |
@@ -66,8 +66,9 @@ |
||
| 66 | 66 | |
| 67 | 67 | protected function setDivider($divider, $index) { |
| 68 | 68 | if (isset($index)) { |
| 69 | - if (! \is_array($this->_contentSeparator)) |
|
| 70 | - $this->_contentSeparator = array_fill(0, $this->count() - 1, $this->_contentSeparator); |
|
| 69 | + if (! \is_array($this->_contentSeparator)) { |
|
| 70 | + $this->_contentSeparator = array_fill(0, $this->count() - 1, $this->_contentSeparator); |
|
| 71 | + } |
|
| 71 | 72 | $this->_contentSeparator[$index] = $divider; |
| 72 | 73 | } else { |
| 73 | 74 | $this->_contentSeparator = $divider; |