@@ -41,8 +41,9 @@ discard block |
||
| 41 | 41 | * @param string $popupEvent |
| 42 | 42 | */ |
| 43 | 43 | public function setPopupAttributes($variation=NULL, $popupEvent=NULL) { |
| 44 | - if (isset($this->_popup)) |
|
| 45 | - $this->_popup->setAttributes($variation, $popupEvent); |
|
| 44 | + if (isset($this->_popup)) { |
|
| 45 | + $this->_popup->setAttributes($variation, $popupEvent); |
|
| 46 | + } |
|
| 46 | 47 | } |
| 47 | 48 | |
| 48 | 49 | /** |
@@ -97,8 +98,9 @@ discard block |
||
| 97 | 98 | $labelO=$label; |
| 98 | 99 | if (\is_object($label) === false) { |
| 99 | 100 | $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
| 100 | - if (isset($icon)) |
|
| 101 | - $labelO->addIcon($icon); |
|
| 101 | + if (isset($icon)) { |
|
| 102 | + $labelO->addIcon($icon); |
|
| 103 | + } |
|
| 102 | 104 | } else { |
| 103 | 105 | $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
| 104 | 106 | } |
@@ -125,10 +127,12 @@ discard block |
||
| 125 | 127 | * @return HtmlSemDoubleElement |
| 126 | 128 | */ |
| 127 | 129 | public function asLink($href=NULL,$target=NULL) { |
| 128 | - if (isset($href)) |
|
| 129 | - $this->setProperty("href", $href); |
|
| 130 | - if(isset($target)) |
|
| 131 | - $this->setProperty("target", $target); |
|
| 130 | + if (isset($href)) { |
|
| 131 | + $this->setProperty("href", $href); |
|
| 132 | + } |
|
| 133 | + if(isset($target)) { |
|
| 134 | + $this->setProperty("target", $target); |
|
| 135 | + } |
|
| 132 | 136 | return $this->setTagName("a"); |
| 133 | 137 | } |
| 134 | 138 | |
@@ -139,8 +143,9 @@ discard block |
||
| 139 | 143 | */ |
| 140 | 144 | public function jsShowDimmer($show=true) { |
| 141 | 145 | $status="hide"; |
| 142 | - if ($show === true) |
|
| 143 | - $status="show"; |
|
| 146 | + if ($show === true) { |
|
| 147 | + $status="show"; |
|
| 148 | + } |
|
| 144 | 149 | return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
| 145 | 150 | } |
| 146 | 151 | |
@@ -16,8 +16,9 @@ discard block |
||
| 16 | 16 | * @param mixed $view |
| 17 | 17 | */ |
| 18 | 18 | protected function _compileLibrary(BaseGui $library, &$view=NULL){ |
| 19 | - if(isset($view)) |
|
| 20 | - $library->compileHtml($this, $view); |
|
| 19 | + if(isset($view)) { |
|
| 20 | + $library->compileHtml($this, $view); |
|
| 21 | + } |
|
| 21 | 22 | if ($library->isAutoCompile()) { |
| 22 | 23 | $library->compile(true); |
| 23 | 24 | } |
@@ -36,7 +37,9 @@ discard block |
||
| 36 | 37 | } |
| 37 | 38 | |
| 38 | 39 | protected function minify($input) { |
| 39 | - if(trim($input) === "") return $input; |
|
| 40 | + if(trim($input) === "") { |
|
| 41 | + return $input; |
|
| 42 | + } |
|
| 40 | 43 | $input= preg_replace( |
| 41 | 44 | array( |
| 42 | 45 | // Remove comment(s) |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | $retour.="var self=this;\n"; |
| 33 | 33 | if($hasLoader===true && JString::isNotNull($responseElement)){ |
| 34 | 34 | $this->addLoading($retour, $responseElement,$ajaxLoader); |
| 35 | - }elseif($hasLoader==="internal"){ |
|
| 35 | + } elseif($hasLoader==="internal"){ |
|
| 36 | 36 | $retour.="\n$(this).addClass('loading');"; |
| 37 | 37 | } |
| 38 | 38 | $ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"]; |
@@ -49,8 +49,9 @@ discard block |
||
| 49 | 49 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
| 50 | 50 | $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n"; |
| 51 | 51 | $retour=$this->_addJsCondition($jsCondition,$retour); |
| 52 | - if ($immediatly) |
|
| 53 | - $this->jquery_code_for_compile[]=$retour; |
|
| 52 | + if ($immediatly) { |
|
| 53 | + $this->jquery_code_for_compile[]=$retour; |
|
| 54 | + } |
|
| 54 | 55 | return $retour; |
| 55 | 56 | } |
| 56 | 57 | |
@@ -86,12 +87,13 @@ discard block |
||
| 86 | 87 | if(JString::isNotNull($attr)){ |
| 87 | 88 | if ($attr==="value"){ |
| 88 | 89 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
| 89 | - }elseif ($attr==="html"){ |
|
| 90 | + } elseif ($attr==="html"){ |
|
| 90 | 91 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
| 91 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
| 92 | + } elseif(\substr($attr, 0,3)==="js:"){ |
|
| 92 | 93 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
| 93 | - }elseif($attr!==null && $attr!=="") |
|
| 94 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 94 | + } elseif($attr!==null && $attr!=="") { |
|
| 95 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 96 | + } |
|
| 95 | 97 | } |
| 96 | 98 | return $retour; |
| 97 | 99 | } |
@@ -111,13 +113,14 @@ discard block |
||
| 111 | 113 | if (JString::isNotNull($responseElement)) { |
| 112 | 114 | if(isset($ajaxTransition)){ |
| 113 | 115 | $call=$this->setAjaxDataCall($ajaxTransition); |
| 114 | - }elseif(isset($this->ajaxTransition)){ |
|
| 116 | + } elseif(isset($this->ajaxTransition)){ |
|
| 115 | 117 | $call=$this->ajaxTransition; |
| 116 | 118 | } |
| 117 | - if(\is_callable($call)) |
|
| 118 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 119 | - else |
|
| 120 | - $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 119 | + if(\is_callable($call)) { |
|
| 120 | + $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 121 | + } else { |
|
| 122 | + $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 123 | + } |
|
| 121 | 124 | } |
| 122 | 125 | if(isset($history)){ |
| 123 | 126 | if($this->params["autoActiveLinks"]){ |
@@ -140,8 +143,9 @@ discard block |
||
| 140 | 143 | } |
| 141 | 144 | |
| 142 | 145 | protected function _correctAjaxUrl($url) { |
| 143 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
| 144 | - $url=substr($url, 0, strlen($url)-1); |
|
| 146 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
| 147 | + $url=substr($url, 0, strlen($url)-1); |
|
| 148 | + } |
|
| 145 | 149 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
| 146 | 150 | $url=$this->getUrl($url); |
| 147 | 151 | } |
@@ -161,8 +165,9 @@ discard block |
||
| 161 | 165 | public static function _implodeParams($parameters){ |
| 162 | 166 | $allParameters=[]; |
| 163 | 167 | foreach ($parameters as $params){ |
| 164 | - if(isset($params)) |
|
| 165 | - $allParameters[]=self::_correctParams($params); |
|
| 168 | + if(isset($params)) { |
|
| 169 | + $allParameters[]=self::_correctParams($params); |
|
| 170 | + } |
|
| 166 | 171 | } |
| 167 | 172 | return \implode("+'&'+", $allParameters); |
| 168 | 173 | } |
@@ -188,8 +193,9 @@ discard block |
||
| 188 | 193 | |
| 189 | 194 | protected function setDefaultParameters(&$parameters,$default){ |
| 190 | 195 | foreach ($default as $k=>$v){ |
| 191 | - if(!isset($parameters[$k])) |
|
| 192 | - $parameters[$k]=$v; |
|
| 196 | + if(!isset($parameters[$k])) { |
|
| 197 | + $parameters[$k]=$v; |
|
| 198 | + } |
|
| 193 | 199 | } |
| 194 | 200 | } |
| 195 | 201 | |
@@ -307,7 +313,7 @@ discard block |
||
| 307 | 313 | if($context===null){ |
| 308 | 314 | $parent="$('".$maskSelector."').parent()"; |
| 309 | 315 | $newElm = "$('#'+newId)"; |
| 310 | - }else{ |
|
| 316 | + } else{ |
|
| 311 | 317 | $parent=$context; |
| 312 | 318 | $newElm = $context.".find('#'+newId)"; |
| 313 | 319 | } |
@@ -533,7 +539,7 @@ discard block |
||
| 533 | 539 | $retour.="var self=this;\n"; |
| 534 | 540 | if($hasLoader===true){ |
| 535 | 541 | $this->addLoading($retour, $responseElement,$ajaxLoader); |
| 536 | - }elseif($hasLoader==="internal"){ |
|
| 542 | + } elseif($hasLoader==="internal"){ |
|
| 537 | 543 | $retour.="\n$(this).addClass('loading');"; |
| 538 | 544 | } |
| 539 | 545 | $ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async]; |
@@ -551,8 +557,9 @@ discard block |
||
| 551 | 557 | $retour.="$('#".$form."').submit();\n"; |
| 552 | 558 | } |
| 553 | 559 | $retour=$this->_addJsCondition($jsCondition, $retour); |
| 554 | - if ($immediatly) |
|
| 555 | - $this->jquery_code_for_compile[]=$retour; |
|
| 560 | + if ($immediatly) { |
|
| 561 | + $this->jquery_code_for_compile[]=$retour; |
|
| 562 | + } |
|
| 556 | 563 | return $retour; |
| 557 | 564 | } |
| 558 | 565 | |
@@ -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 | |
@@ -84,15 +84,17 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | public function getColspan() { |
| 86 | 86 | $colspan=1; |
| 87 | - if (\array_key_exists("colspan", $this->properties)) |
|
| 88 | - $colspan=$this->getProperty("colspan"); |
|
| 87 | + if (\array_key_exists("colspan", $this->properties)) { |
|
| 88 | + $colspan=$this->getProperty("colspan"); |
|
| 89 | + } |
|
| 89 | 90 | return $colspan; |
| 90 | 91 | } |
| 91 | 92 | |
| 92 | 93 | public function getRowspan() { |
| 93 | 94 | $rowspan=1; |
| 94 | - if (\array_key_exists("rowspan", $this->properties)) |
|
| 95 | - $rowspan=$this->getProperty("rowspan"); |
|
| 95 | + if (\array_key_exists("rowspan", $this->properties)) { |
|
| 96 | + $rowspan=$this->getProperty("rowspan"); |
|
| 97 | + } |
|
| 96 | 98 | return $rowspan; |
| 97 | 99 | } |
| 98 | 100 | |
@@ -129,7 +131,8 @@ discard block |
||
| 129 | 131 | } |
| 130 | 132 | |
| 131 | 133 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 132 | - if(!$this->_deleted) |
|
| 133 | - return parent::compile($js,$view); |
|
| 134 | + if(!$this->_deleted) { |
|
| 135 | + return parent::compile($js,$view); |
|
| 136 | + } |
|
| 134 | 137 | } |
| 135 | 138 | } |
@@ -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 | |
@@ -64,8 +64,9 @@ |
||
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | public static function doubleBackSlashes($value){ |
| 67 | - if(is_string($value)) |
|
| 68 | - return str_replace("\\", "\\\\", $value); |
|
| 67 | + if(is_string($value)) { |
|
| 68 | + return str_replace("\\", "\\\\", $value); |
|
| 69 | + } |
|
| 69 | 70 | return $value; |
| 70 | 71 | } |
| 71 | 72 | |