@@ -213,8 +213,7 @@ |
||
213 | 213 | return $this->postscript[0]. |
214 | 214 | strtr($string, $args). |
215 | 215 | $this->postscript[1]; |
216 | - } |
|
217 | - else |
|
216 | + } else |
|
218 | 217 | return strtr($target, $args); |
219 | 218 | } |
220 | 219 | } |
@@ -58,8 +58,7 @@ |
||
58 | 58 | if ($this->sourcepath === NULL) |
59 | 59 | { |
60 | 60 | $this->sourcepath = $sourcepath; |
61 | - } |
|
62 | - else |
|
61 | + } else |
|
63 | 62 | { |
64 | 63 | $this->sourcepath->append($sourcepath); |
65 | 64 | } |
@@ -164,8 +164,7 @@ |
||
164 | 164 | try |
165 | 165 | { |
166 | 166 | $highlighter=Text_Highlighter::factory($this->getLanguage()); |
167 | - } |
|
168 | - catch(Exception $e) |
|
167 | + } catch(Exception $e) |
|
169 | 168 | { |
170 | 169 | $highlighter=false; |
171 | 170 | } |
@@ -70,8 +70,7 @@ |
||
70 | 70 | { |
71 | 71 | $domain=substr($value,$pos+1); |
72 | 72 | return $domain===''?false:checkdnsrr($domain,'MX'); |
73 | - } |
|
74 | - else |
|
73 | + } else |
|
75 | 74 | return false; |
76 | 75 | } |
77 | 76 | } |
@@ -260,8 +260,7 @@ discard block |
||
260 | 260 | if(!empty($this->cache)) |
261 | 261 | $this->cache->clean($variant, $this->culture); |
262 | 262 | return true; |
263 | - } |
|
264 | - else |
|
263 | + } else |
|
265 | 264 | return false; |
266 | 265 | } |
267 | 266 | return false; |
@@ -304,8 +303,7 @@ discard block |
||
304 | 303 | if(!empty($this->cache)) |
305 | 304 | $this->cache->clean($variant, $this->culture); |
306 | 305 | return true; |
307 | - } |
|
308 | - else |
|
306 | + } else |
|
309 | 307 | return false; |
310 | 308 | } |
311 | 309 | } |
@@ -354,8 +352,7 @@ discard block |
||
354 | 352 | if(!empty($this->cache)) |
355 | 353 | $this->cache->clean($variant, $this->culture); |
356 | 354 | return true; |
357 | - } |
|
358 | - else |
|
355 | + } else |
|
359 | 356 | return false; |
360 | 357 | } |
361 | 358 | } |
@@ -233,8 +233,7 @@ discard block |
||
233 | 233 | $newid=substr($id,$pos+1); |
234 | 234 | if ($control!==null) |
235 | 235 | $control=$control->$newid; |
236 | - } |
|
237 | - else |
|
236 | + } else |
|
238 | 237 | { |
239 | 238 | // TCheckBoxList overrides findControl() with a fake implementation |
240 | 239 | // but accepts a second parameter to use the standard one |
@@ -296,8 +295,7 @@ discard block |
||
296 | 295 | { |
297 | 296 | $group=$this->getValidationGroup(); |
298 | 297 | return $this->getPage()->getValidators($group)->getCount()>0; |
299 | - } |
|
300 | - else |
|
298 | + } else |
|
301 | 299 | return false; |
302 | 300 | } |
303 | 301 |
@@ -189,8 +189,7 @@ discard block |
||
189 | 189 | return file_put_contents($fileName,file_get_contents($this->_localName))!==false; |
190 | 190 | else |
191 | 191 | return false; |
192 | - } |
|
193 | - else |
|
192 | + } else |
|
194 | 193 | return false; |
195 | 194 | } |
196 | 195 | |
@@ -211,8 +210,7 @@ discard block |
||
211 | 210 | $this->_errorCode=$_FILES[$key]['error']; |
212 | 211 | $this->_localName=$_FILES[$key]['tmp_name']; |
213 | 212 | return $this->_dataChanged=true; |
214 | - } |
|
215 | - else |
|
213 | + } else |
|
216 | 214 | return false; |
217 | 215 | } |
218 | 216 |
@@ -164,8 +164,7 @@ discard block |
||
164 | 164 | { |
165 | 165 | $am=self::$_application->getAssetManager(); |
166 | 166 | $url=$am->publishFilePath(self::getPathOfNamespace('Prado\\'.$logoName,'.gif')); |
167 | - } |
|
168 | - else |
|
167 | + } else |
|
169 | 168 | $url='http://pradosoft.github.io/docs/'.$logoName.'.gif'; |
170 | 169 | return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>'; |
171 | 170 | } |
@@ -217,8 +216,7 @@ discard block |
||
217 | 216 | if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null) |
218 | 217 | { |
219 | 218 | $errorHandler->handleError(null,$exception); |
220 | - } |
|
221 | - else |
|
219 | + } else |
|
222 | 220 | { |
223 | 221 | echo $exception; |
224 | 222 | } |
@@ -329,8 +327,7 @@ discard block |
||
329 | 327 | return $component; |
330 | 328 | break; |
331 | 329 | } |
332 | - } |
|
333 | - else |
|
330 | + } else |
|
334 | 331 | return new $type; |
335 | 332 | } |
336 | 333 | |
@@ -369,15 +366,13 @@ discard block |
||
369 | 366 | |
370 | 367 | if($checkClassExistence && !class_exists($namespace,false) && !interface_exists($namespace,false)) |
371 | 368 | throw new TInvalidOperationException('prado_component_unknown',$namespace,''); |
372 | - } |
|
373 | - else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null) |
|
369 | + } else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null) |
|
374 | 370 | { |
375 | 371 | $className=substr($namespace,$pos+1); |
376 | 372 | if($className==='*') // a directory |
377 | 373 | { |
378 | 374 | self::$_usings[substr($namespace, 0, $pos)]=$path; |
379 | - } |
|
380 | - else // a file |
|
375 | + } else // a file |
|
381 | 376 | { |
382 | 377 | //self::$_usings[$namespace]=$path; |
383 | 378 | if(!$checkClassExistence || (!class_exists($className,false) && !interface_exists($className, false))) |
@@ -387,8 +382,7 @@ discard block |
||
387 | 382 | include_once($path); |
388 | 383 | if(class_exists($namespace, false) || interface_exists($namespace, false)) |
389 | 384 | class_alias($namespace, $className, true); |
390 | - } |
|
391 | - catch(\Exception $e) |
|
385 | + } catch(\Exception $e) |
|
392 | 386 | { |
393 | 387 | if($checkClassExistence && !class_exists($className,false)) |
394 | 388 | throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage()); |
@@ -464,8 +458,7 @@ discard block |
||
464 | 458 | self::$_aliases[$alias]=$rp; |
465 | 459 | else |
466 | 460 | throw new TInvalidDataValueException('prado_aliasname_invalid',$alias); |
467 | - } |
|
468 | - else |
|
461 | + } else |
|
469 | 462 | throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path); |
470 | 463 | } |
471 | 464 | |
@@ -510,8 +503,7 @@ discard block |
||
510 | 503 | echo "'". substr($str, 0, 70) . "...'"; |
511 | 504 | else |
512 | 505 | echo "'" . $str . "'"; |
513 | - } |
|
514 | - else if (is_int($item) || is_float($item)) |
|
506 | + } else if (is_int($item) || is_float($item)) |
|
515 | 507 | echo $item; |
516 | 508 | else if (is_object($item)) |
517 | 509 | echo get_class($item); |
@@ -606,8 +598,7 @@ discard block |
||
606 | 598 | if(isset($trace[0]['file']) && isset($trace[0]['line'])) |
607 | 599 | $msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})"; |
608 | 600 | $level=TLogger::DEBUG; |
609 | - } |
|
610 | - else |
|
601 | + } else |
|
611 | 602 | $level=TLogger::INFO; |
612 | 603 | self::log($msg,$level,$category,$ctl); |
613 | 604 | } |
@@ -58,8 +58,7 @@ |
||
58 | 58 | if ($this->sourcepath === NULL) |
59 | 59 | { |
60 | 60 | $this->sourcepath = $sourcepath; |
61 | - } |
|
62 | - else |
|
61 | + } else |
|
63 | 62 | { |
64 | 63 | $this->sourcepath->append($sourcepath); |
65 | 64 | } |