chore: Bootstrap refactoring

Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2024-04-20 11:59:23 +02:00
parent 03e4a57562
commit 4e346d9f1a
99 changed files with 645 additions and 1015 deletions

View File

@@ -28,7 +28,6 @@ namespace SP\Modules\Web\Controllers\Account;
use Exception;
use SP\Core\Acl\Acl;
use SP\Core\Application;
use SP\Core\Bootstrap\BootstrapBase;
use SP\Core\Crypt\Vault;
use SP\Core\Events\Event;
use SP\Core\Events\EventMessage;
@@ -57,11 +56,11 @@ final class ViewLinkController extends AccountControllerBase
private ImageUtil $imageUtil;
public function __construct(
Application $application,
Application $application,
WebControllerHelper $webControllerHelper,
AccountService $accountService,
PublicLinkService $publicLinkService,
ImageUtilInterface $imageUtil
AccountService $accountService,
PublicLinkService $publicLinkService,
ImageUtilInterface $imageUtil
) {
parent::__construct(
$application,
@@ -138,7 +137,8 @@ final class ViewLinkController extends AccountControllerBase
? '***'
: $this->request->getClientAddress(true);
$baseUrl = ($this->configData->getApplicationUrl() ?: BootstrapBase::$WEBURI) . BootstrapBase::$SUBURI;
$baseUrl = ($this->configData->getApplicationUrl() ?: $this->uriContext->getWebUri()) .
$this->uriContext->getSubUri();
$deepLink = new Uri($baseUrl);
$deepLink->addParam(