viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Portal url fixes

Browse Source
This commit is contained in:
Taras Machyshyn
2017-11-09 16:32:25 +02:00
parent 1e2700cde1
commit 7581205800
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/Espo/EntryPoints/Portal.php
View File

@@ -44,9 +44,14 @@ class Portal extends \Espo\Core\EntryPoints\Base
} else if (!empty($data['id'])) {
$id = $data['id'];
} else {
$url = !empty($_SERVER['REDIRECT_URL']) ? $_SERVER['REDIRECT_URL'] : $_SERVER['REQUEST_URI'];
$url = $_SERVER['REQUEST_URI'];
$id = explode('/', $url)[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
if (!isset($id)) {
$url = $_SERVER['REDIRECT_URL'];
$id = explode('/', $url)[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
}
if (!$id) {
$id = $this->getConfig()->get('defaultPortalId');
}

9
portal/index.php
View File

@@ -34,7 +34,13 @@ if (!$app->isInstalled()) {
exit;
}
$url = !empty($_SERVER['REDIRECT_URL']) ? $_SERVER['REDIRECT_URL'] : $_SERVER['REQUEST_URI'];
$url = $_SERVER['REQUEST_URI'];
$portalId = explode('/', $url)[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
if (!isset($portalId)) {
$url = $_SERVER['REDIRECT_URL'];
$portalId = explode('/', $url)[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
}
$a = explode('?', $url);
if (substr($a[0], -1) !== '/') {
@@ -46,7 +52,6 @@ if (substr($a[0], -1) !== '/') {
exit();
}
$portalId = explode('/', $url)[count(explode('/', $_SERVER['SCRIPT_NAME'])) - 1];
if ($portalId) {
$app->setBasePath('../../');
} else {