Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge subdomain fix

Browse Source
This commit is contained in:
Hillel Coren 2018-01-15 22:48:53 +02:00
parent 2417005b23
commit c30547a331
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Middleware/DatabaseLookup.php
View File

@ -58,6 +58,11 @@ class DatabaseLookup
} elseif ($guard == 'account') { } elseif ($guard == 'account') {
if ($key = request()->account_key) { if ($key = request()->account_key) {
LookupAccount::setServerByField('account_key', $key); LookupAccount::setServerByField('account_key', $key);
} else {
$subdomain = Utils::getSubdomain(\Request::server('HTTP_HOST'));
if ($subdomain != 'app') {
LookupAccount::setServerByField('subdomain', $subdomain);
}
} }
} elseif ($guard == 'license') { } elseif ($guard == 'license') {
config(['database.default' => DB_NINJA_1]); config(['database.default' => DB_NINJA_1]);

8
app/Libraries/Utils.php
View File

@ -1002,8 +1002,12 @@ class Utils
$parts = parse_url($url); $parts = parse_url($url);
$subdomain = ''; $subdomain = '';
if (isset($parts['host'])) { if (isset($parts['host']) || isset($parts['path'])) {
$host = explode('.', $parts['host']); if (isset($parts['host'])) {
$host = explode('.', $parts['host']);
} else {
$host = explode('.', $parts['path']);
}
if (count($host) > 2) { if (count($host) > 2) {
$subdomain = $host[0]; $subdomain = $host[0];
} }