diff options
| author | emkael <emkael@tlen.pl> | 2016-04-25 12:20:45 +0200 |
|---|---|---|
| committer | emkael <emkael@tlen.pl> | 2016-04-25 12:20:45 +0200 |
| commit | 7a728e107ca20c98cacea406ab555d3d12605caf (patch) | |
| tree | 2a75b588d3950c0ccee3856679aaabcbb4a36b75 | |
| parent | 37ceed32d8486c8e33cb6ce79ef6b7b4af03a64d (diff) | |
* BaseUrl derivation from BasePath separated to a trait, as it's about to become useful
| -rw-r--r-- | app/php/web/AssetManager.php | 24 | ||||
| -rw-r--r-- | app/php/web/BaseUrlDerivedFromBasePath.php | 29 |
2 files changed, 32 insertions, 21 deletions
diff --git a/app/php/web/AssetManager.php b/app/php/web/AssetManager.php index 72d8ef1..2677585 100644 --- a/app/php/web/AssetManager.php +++ b/app/php/web/AssetManager.php @@ -1,28 +1,10 @@ <?php +Prado::using('Application.web.BaseUrlDerivedFromBasePath'); + class AssetManager extends TAssetManager { - public function init($config) { - if ($this->BaseUrl === NULL && $this->BasePath !== NULL) { - $appWebPath = preg_replace( - '#' . $this->Application->Request->ApplicationUrl . '$#', - '', - $this->Application->Request->ApplicationFilePath - ); - $appBaseUrl = preg_replace( - '#^' . $appWebPath . '#', - '', - dirname($this->Application->Request->ApplicationFilePath) - ); - $this->BaseUrl = $appBaseUrl - . preg_replace( - '#^' . Prado::getPathOfNamespace('Web') . '#', - '', - $this->BasePath - ); - } - parent::init($config); - } + use BaseUrlDerivedFromBasePath; } diff --git a/app/php/web/BaseUrlDerivedFromBasePath.php b/app/php/web/BaseUrlDerivedFromBasePath.php new file mode 100644 index 0000000..2da277f --- /dev/null +++ b/app/php/web/BaseUrlDerivedFromBasePath.php @@ -0,0 +1,29 @@ +<?php + +trait BaseUrlDerivedFromBasePath { + + public function init($config) { + if ($this->BaseUrl === NULL && $this->BasePath !== NULL) { + $appWebPath = preg_replace( + '#' . $this->Application->Request->ApplicationUrl . '$#', + '', + $this->Application->Request->ApplicationFilePath + ); + $appBaseUrl = preg_replace( + '#^' . $appWebPath . '#', + '', + dirname($this->Application->Request->ApplicationFilePath) + ); + $this->BaseUrl = $appBaseUrl + . preg_replace( + '#^' . Prado::getPathOfNamespace('Web') . '#', + '', + $this->BasePath + ); + } + parent::init($config); + } + +} + +?> |