From c217365840f8246575b3fabb192397323536790b Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Sat, 5 Jun 2021 10:32:22 +0200 Subject: [PATCH] Replace 'http://localhost/' with AccessUrl::DEFAULT_ACCESS_URL --- public/main/inc/lib/api.lib.php | 2 +- public/main/install/install.lib.php | 4 ++-- src/CoreBundle/DataFixtures/AccessUrlFixtures.php | 2 +- src/CoreBundle/Entity/AccessUrl.php | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/public/main/inc/lib/api.lib.php b/public/main/inc/lib/api.lib.php index f8a779f31f..d2bf7115bf 100644 --- a/public/main/inc/lib/api.lib.php +++ b/public/main/inc/lib/api.lib.php @@ -5155,7 +5155,7 @@ function api_get_access_url($id, $returnDefault = true) // information on another URL instead of the one asked as parameter if (1 === $currentUrl) { $rootWeb = api_get_path(WEB_PATH); - $default = 'http://localhost/'; + $default = AccessUrl::DEFAULT_ACCESS_URL; if ($result['url'] === $default && $rootWeb != $default) { $result['url'] = $rootWeb; } diff --git a/public/main/install/install.lib.php b/public/main/install/install.lib.php index 640ce98c39..633da52002 100644 --- a/public/main/install/install.lib.php +++ b/public/main/install/install.lib.php @@ -2300,10 +2300,10 @@ function installSchemas($container, $upgrade = false) if (null === $accessUrl) { $em = Database::getManager(); - // Creating AccessUrl + // Creating AccessUrl. $accessUrl = new AccessUrl(); $accessUrl - ->setUrl('http://localhost/') + ->setUrl(AccessUrl::DEFAULT_ACCESS_URL) ->setDescription('') ->setActive(1) ->setCreatedBy(1) diff --git a/src/CoreBundle/DataFixtures/AccessUrlFixtures.php b/src/CoreBundle/DataFixtures/AccessUrlFixtures.php index da2f1aed1f..e81f02c0cc 100644 --- a/src/CoreBundle/DataFixtures/AccessUrlFixtures.php +++ b/src/CoreBundle/DataFixtures/AccessUrlFixtures.php @@ -45,7 +45,7 @@ class AccessUrlFixtures extends Fixture implements ContainerAwareInterface $client->loginUser($admin);*/ $accessUrl = (new AccessUrl()) - ->setUrl('http://localhost/') + ->setUrl(AccessUrl::DEFAULT_ACCESS_URL) ->setDescription('') ->setActive(1) ->setCreatedBy(1) diff --git a/src/CoreBundle/Entity/AccessUrl.php b/src/CoreBundle/Entity/AccessUrl.php index f2d7fc38e1..1249ccf4c0 100644 --- a/src/CoreBundle/Entity/AccessUrl.php +++ b/src/CoreBundle/Entity/AccessUrl.php @@ -29,6 +29,8 @@ use Symfony\Component\Validator\Constraints as Assert; */ class AccessUrl extends AbstractResource implements ResourceInterface { + public const DEFAULT_ACCESS_URL = 'http://localhost/'; + /** * @ORM\Column(name="id", type="integer") * @ORM\Id