X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FBaseURL.php;h=9a8348510de65d8993de6480c1c8d1bb8f390c3c;hb=204e52ea307b182175ae0c64d6eb69c71a104658;hp=6b79fad4662e6c0c88ad6bb18d457c79ad033e16;hpb=b9dba631aadf6c25a97b679808c684276b3dd76a;p=friendica.git diff --git a/src/App/BaseURL.php b/src/App/BaseURL.php index 6b79fad466..9a8348510d 100644 --- a/src/App/BaseURL.php +++ b/src/App/BaseURL.php @@ -1,8 +1,27 @@ . + * + */ namespace Friendica\App; -use Friendica\Core\Config\IConfiguration; +use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\System; use Friendica\Util\Network; use Friendica\Util\Strings; @@ -37,7 +56,7 @@ class BaseURL /** * The Friendica Config * - * @var IConfiguration + * @var IManageConfigValues */ private $config; @@ -213,7 +232,7 @@ class BaseURL { $parsed = @parse_url($url); - if (empty($parsed)) { + if (empty($parsed) || empty($parsed['host'])) { return false; } @@ -253,10 +272,10 @@ class BaseURL } /** - * @param IConfiguration $config The Friendica IConfiguration - * @param array $server The $_SERVER array + * @param IManageConfigValues $config The Friendica IConfiguration + * @param array $server The $_SERVER array */ - public function __construct(IConfiguration $config, array $server) + public function __construct(IManageConfigValues $config, array $server) { $this->config = $config; $this->server = $server; @@ -355,7 +374,7 @@ class BaseURL if (!empty($relative_script_path)) { // Module if (!empty($this->server['QUERY_STRING'])) { - $this->urlPath = trim(rdirname($relative_script_path, substr_count(trim($this->server['QUERY_STRING'], '/'), '/') + 1), '/'); + $this->urlPath = trim(dirname($relative_script_path, substr_count(trim($this->server['QUERY_STRING'], '/'), '/') + 1), '/'); } else { // Root page $this->urlPath = trim($relative_script_path, '/');