@@ -140,8 +140,9 @@ discard block |
||
| 140 | 140 | |
| 141 | 141 | private function parseRaw($source) |
| 142 | 142 | { |
| 143 | - if (!$source) |
|
| 144 | - return []; |
|
| 143 | + if (!$source) { |
|
| 144 | + return []; |
|
| 145 | + } |
|
| 145 | 146 | |
| 146 | 147 | preg_match_all("|{([^}]+)}|", $source, $result); |
| 147 | 148 | return $result[1]; |
@@ -327,10 +328,11 @@ discard block |
||
| 327 | 328 | $this->ResolveCssHref($css, $type, $hrefs); |
| 328 | 329 | continue; |
| 329 | 330 | } |
| 330 | - if (strpos($css, '//') !== false) |
|
| 331 | - $href = $css; |
|
| 332 | - else |
|
| 333 | - $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
| 331 | + if (strpos($css, '//') !== false) { |
|
| 332 | + $href = $css; |
|
| 333 | + } else { |
|
| 334 | + $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
| 335 | + } |
|
| 334 | 336 | $hrefs[$href] = $href; |
| 335 | 337 | } |
| 336 | 338 | break; |
@@ -340,10 +342,11 @@ discard block |
||
| 340 | 342 | $this->ResolveCssHref($css, $type, $hrefs); |
| 341 | 343 | continue; |
| 342 | 344 | } |
| 343 | - if (strpos($css, '://') !== false) |
|
| 344 | - $href = $css; |
|
| 345 | - else |
|
| 346 | - $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}"; |
|
| 345 | + if (strpos($css, '://') !== false) { |
|
| 346 | + $href = $css; |
|
| 347 | + } else { |
|
| 348 | + $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}"; |
|
| 349 | + } |
|
| 347 | 350 | $hrefs[$href] = $href; |
| 348 | 351 | } |
| 349 | 352 | break; |
@@ -353,10 +356,11 @@ discard block |
||
| 353 | 356 | $this->ResolveCssHref($css, $type, $hrefs); |
| 354 | 357 | continue; |
| 355 | 358 | } |
| 356 | - if (strpos($css, '//') !== false) |
|
| 357 | - $href = $css; |
|
| 358 | - else |
|
| 359 | - $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
| 359 | + if (strpos($css, '//') !== false) { |
|
| 360 | + $href = $css; |
|
| 361 | + } else { |
|
| 362 | + $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
| 363 | + } |
|
| 360 | 364 | $hrefs[$href] = $href; |
| 361 | 365 | } |
| 362 | 366 | break; |
@@ -410,8 +414,9 @@ discard block |
||
| 410 | 414 | $noParsedScripts = []; |
| 411 | 415 | foreach ($scripts as $script) { |
| 412 | 416 | if (is_string($script)) { |
| 413 | - if (!empty($urls[$script])) |
|
| 414 | - continue; |
|
| 417 | + if (!empty($urls[$script])) { |
|
| 418 | + continue; |
|
| 419 | + } |
|
| 415 | 420 | |
| 416 | 421 | $path = $this->app->staticLoader->parsePath($script); |
| 417 | 422 | if (file_exists($path)) { |
@@ -422,8 +427,9 @@ discard block |
||
| 422 | 427 | $noParsedScripts[$script] = $script; |
| 423 | 428 | } |
| 424 | 429 | } elseif (!empty($script['file'])) { |
| 425 | - if (!empty($urls[$script['file']])) |
|
| 426 | - continue; |
|
| 430 | + if (!empty($urls[$script['file']])) { |
|
| 431 | + continue; |
|
| 432 | + } |
|
| 427 | 433 | |
| 428 | 434 | $path = $this->app->staticLoader->parsePath($script['file']); |
| 429 | 435 | if (file_exists($path)) { |
@@ -482,12 +488,14 @@ discard block |
||
| 482 | 488 | $this->genScriptArray($js, $type, $resultArray); |
| 483 | 489 | continue; |
| 484 | 490 | } |
| 485 | - if (strpos($js, '//') !== false) |
|
| 486 | - $href = $js; |
|
| 487 | - else |
|
| 488 | - $href = $this->getHref('js', $js); |
|
| 489 | - if (!$href) |
|
| 490 | - continue; |
|
| 491 | + if (strpos($js, '//') !== false) { |
|
| 492 | + $href = $js; |
|
| 493 | + } else { |
|
| 494 | + $href = $this->getHref('js', $js); |
|
| 495 | + } |
|
| 496 | + if (!$href) { |
|
| 497 | + continue; |
|
| 498 | + } |
|
| 491 | 499 | |
| 492 | 500 | $resultArray[] = $href; |
| 493 | 501 | } |
@@ -498,10 +506,11 @@ discard block |
||
| 498 | 506 | $this->genScriptArray($js, $type, $resultArray); |
| 499 | 507 | continue; |
| 500 | 508 | } |
| 501 | - if (strpos($js, '//') !== false) |
|
| 502 | - $href = $js; |
|
| 503 | - else |
|
| 504 | - $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}"; |
|
| 509 | + if (strpos($js, '//') !== false) { |
|
| 510 | + $href = $js; |
|
| 511 | + } else { |
|
| 512 | + $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}"; |
|
| 513 | + } |
|
| 505 | 514 | $resultArray[] = $href; |
| 506 | 515 | } |
| 507 | 516 | break; |
@@ -517,8 +526,9 @@ discard block |
||
| 517 | 526 | $asset = []; |
| 518 | 527 | } |
| 519 | 528 | $asset['file'] = $this->getHref('js', $js); |
| 520 | - if (!$asset['file']) |
|
| 521 | - continue; |
|
| 529 | + if (!$asset['file']) { |
|
| 530 | + continue; |
|
| 531 | + } |
|
| 522 | 532 | $resultArray[] = $asset; |
| 523 | 533 | } |
| 524 | 534 | break; |
@@ -568,8 +578,9 @@ discard block |
||
| 568 | 578 | $paramArray = true; |
| 569 | 579 | } |
| 570 | 580 | } |
| 571 | - if (!$paramArray) |
|
| 572 | - $lineParams = ':' . implode(':', $_params); |
|
| 581 | + if (!$paramArray) { |
|
| 582 | + $lineParams = ':' . implode(':', $_params); |
|
| 583 | + } |
|
| 573 | 584 | } |
| 574 | 585 | } |
| 575 | 586 | echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n"; |