bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-13 13:35:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Marcel Pociot
2021-06-02 08:22:02 +00:00
committed by StyleCI Bot
parent 2c8804cff3
commit 01ce0d09e3
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Server/Http/Controllers/Admin/StoreSubdomainController.php
View File

@@ -22,7 +22,7 @@ class StoreSubdomainController extends AdminController
/** @var Configuration */
protected $configuration;
public function __construct(UserRepository $userRepository, SubdomainRepository $subdomainRepository, Configuration $configuration)
public function __construct(UserRepository $userRepository, SubdomainRepository $subdomainRepository, Configuration $configuration)
{
$this->userRepository = $userRepository;
$this->subdomainRepository = $subdomainRepository;

5
app/Server/Http/Controllers/ControlMessageController.php
View File

@@ -275,7 +275,7 @@ class ControlMessageController implements MessageComponentInterface
$this->domainRepository
->getDomainsByUserId($user['id'])
->then(function ($domains) use ($connection, $deferred, $user, $serverHost) {
->then(function ($domains) use ($connection, $deferred , $serverHost) {
$userDomain = collect($domains)->first(function ($domain) use ($serverHost) {
return strtolower($domain['domain']) === strtolower($serverHost);
});
@@ -290,6 +290,7 @@ class ControlMessageController implements MessageComponentInterface
$connection->close();
$deferred->reject(null);
return;
}
@@ -324,7 +325,7 @@ class ControlMessageController implements MessageComponentInterface
if (! is_null($subdomain)) {
return $this->subdomainRepository->getSubdomainByNameAndDomain($subdomain, $serverHost)
->then(function ($foundSubdomain) use ($connection, $subdomain, $user, $serverHost) {
if (! is_null($foundSubdomain) && ! is_null($user) && $foundSubdomain['user_id'] !== $user['id']){
if (! is_null($foundSubdomain) && ! is_null($user) && $foundSubdomain['user_id'] !== $user['id']) {
$message = config('expose.admin.messages.subdomain_reserved');
$message = str_replace(':subdomain', $subdomain, $message);

2
app/Server/SubdomainRepository/DatabaseSubdomainRepository.php
View File

@@ -64,7 +64,7 @@ class DatabaseSubdomainRepository implements SubdomainRepository
$this->database
->query('SELECT * FROM subdomains WHERE subdomain = :name AND domain = :domain', [
'name' => $name,
'domain' => $domain
'domain' => $domain,
])
->then(function (Result $result) use ($deferred) {
$deferred->resolve($result->rows[0] ?? null);