@@ -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 | } |
@@ -52,8 +52,9 @@ discard block |
||
52 | 52 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
53 | 53 | $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
54 | 54 | $retour=$this->_addJsCondition($jsCondition,$retour); |
55 | - if ($immediatly) |
|
56 | - $this->jquery_code_for_compile[]=$retour; |
|
55 | + if ($immediatly) { |
|
56 | + $this->jquery_code_for_compile[]=$retour; |
|
57 | + } |
|
57 | 58 | return $retour; |
58 | 59 | } |
59 | 60 | |
@@ -89,12 +90,13 @@ discard block |
||
89 | 90 | if(JString::isNotNull($attr)){ |
90 | 91 | if ($attr==="value"){ |
91 | 92 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
92 | - }elseif ($attr==="html"){ |
|
93 | + } elseif ($attr==="html"){ |
|
93 | 94 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
94 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
95 | + } elseif(\substr($attr, 0,3)==="js:"){ |
|
95 | 96 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
96 | - }elseif($attr!==null && $attr!=="") |
|
97 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
97 | + } elseif($attr!==null && $attr!=="") { |
|
98 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
99 | + } |
|
98 | 100 | } |
99 | 101 | return $retour; |
100 | 102 | } |
@@ -104,13 +106,14 @@ discard block |
||
104 | 106 | if (JString::isNotNull($responseElement)) { |
105 | 107 | if(isset($ajaxTransition)){ |
106 | 108 | $call=$this->setAjaxDataCall($ajaxTransition); |
107 | - }elseif(isset($this->ajaxTransition)){ |
|
109 | + } elseif(isset($this->ajaxTransition)){ |
|
108 | 110 | $call=$this->ajaxTransition; |
109 | 111 | } |
110 | - if(\is_callable($call)) |
|
111 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
112 | - else |
|
113 | - $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
112 | + if(\is_callable($call)) { |
|
113 | + $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
114 | + } else { |
|
115 | + $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
116 | + } |
|
114 | 117 | } |
115 | 118 | $retour.="\t".$jsCallback."\n"; |
116 | 119 | return $retour; |
@@ -125,8 +128,9 @@ discard block |
||
125 | 128 | } |
126 | 129 | |
127 | 130 | protected function _correctAjaxUrl($url) { |
128 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
129 | - $url=substr($url, 0, strlen($url)-1); |
|
131 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
132 | + $url=substr($url, 0, strlen($url)-1); |
|
133 | + } |
|
130 | 134 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
131 | 135 | $url=$this->getUrl($url); |
132 | 136 | } |
@@ -146,8 +150,9 @@ discard block |
||
146 | 150 | public static function _implodeParams($parameters){ |
147 | 151 | $allParameters=[]; |
148 | 152 | foreach ($parameters as $params){ |
149 | - if(isset($params)) |
|
150 | - $allParameters[]=self::_correctParams($params); |
|
153 | + if(isset($params)) { |
|
154 | + $allParameters[]=self::_correctParams($params); |
|
155 | + } |
|
151 | 156 | } |
152 | 157 | return \implode("+'&'+", $allParameters); |
153 | 158 | } |
@@ -176,8 +181,9 @@ discard block |
||
176 | 181 | |
177 | 182 | protected function setDefaultParameters(&$parameters,$default){ |
178 | 183 | foreach ($default as $k=>$v){ |
179 | - if(!isset($parameters[$k])) |
|
180 | - $parameters[$k]=$v; |
|
184 | + if(!isset($parameters[$k])) { |
|
185 | + $parameters[$k]=$v; |
|
186 | + } |
|
181 | 187 | } |
182 | 188 | } |
183 | 189 | |
@@ -295,7 +301,7 @@ discard block |
||
295 | 301 | if($context===null){ |
296 | 302 | $parent="$('".$maskSelector."').parent()"; |
297 | 303 | $newElm = "$('#'+newId)"; |
298 | - }else{ |
|
304 | + } else{ |
|
299 | 305 | $parent=$context; |
300 | 306 | $newElm = $context.".find('#'+newId)"; |
301 | 307 | } |
@@ -497,8 +503,9 @@ discard block |
||
497 | 503 | $retour.="$('#".$form."').submit();\n"; |
498 | 504 | } |
499 | 505 | $retour=$this->_addJsCondition($jsCondition, $retour); |
500 | - if ($immediatly) |
|
501 | - $this->jquery_code_for_compile[]=$retour; |
|
506 | + if ($immediatly) { |
|
507 | + $this->jquery_code_for_compile[]=$retour; |
|
508 | + } |
|
502 | 509 | return $retour; |
503 | 510 | } |
504 | 511 |
@@ -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; |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | if(isset($router)){ |
14 | 14 | try { |
15 | 15 | $url=$router->generate($url); |
16 | - }catch (\Exception $e){ |
|
16 | + } catch (\Exception $e){ |
|
17 | 17 | return $url; |
18 | 18 | } |
19 | 19 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $view["q"]=array(); |
26 | 26 | } |
27 | 27 | $view["q"][$identifier]=$content; |
28 | - }elseif($view instanceof \Twig_Environment){ |
|
28 | + } elseif($view instanceof \Twig_Environment){ |
|
29 | 29 | $vars=$view->getGlobals(); |
30 | 30 | if(\array_key_exists("q", $vars)===false){ |
31 | 31 | $vars["q"]=array(); |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | protected function addVariable($key,$value,&$view){ |
43 | 43 | if(\is_array($view)){ |
44 | 44 | $view[$key]=$value; |
45 | - }elseif($view instanceof \Twig_Environment){ |
|
45 | + } elseif($view instanceof \Twig_Environment){ |
|
46 | 46 | $view->addGlobal($key,$value); |
47 | 47 | } |
48 | 48 | } |
@@ -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,9 +217,9 @@ discard block |
||
213 | 217 | if(\strstr($result, "%{$key}%")!==false){ |
214 | 218 | if (\is_array($value)) { |
215 | 219 | $v=PropertyWrapper::wrap($value, $js); |
216 | - }elseif($value instanceof \stdClass){ |
|
220 | + } elseif($value instanceof \stdClass){ |
|
217 | 221 | $v=\print_r($value,true); |
218 | - }else{ |
|
222 | + } else{ |
|
219 | 223 | $v=$value; |
220 | 224 | } |
221 | 225 | $result=str_replace("%{$key}%", $v, $result); |
@@ -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 | } |
@@ -16,8 +16,9 @@ discard block |
||
16 | 16 | * @param mixed $view |
17 | 17 | */ |
18 | 18 | protected function _compileLibrary(BaseGui $library=NULL, &$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 | return preg_replace( |
41 | 44 | array( |
42 | 45 | // Remove comment(s) |
@@ -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 | } |