diff --git a/.codeclimate.yml b/.codeclimate.yml index 4ade345150..a29c0f42f3 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -65,32 +65,29 @@ exclude_patterns: - var/cache/ - var/log/ - config/ - - app/SymfonyRequirements.php - - app/Migrations/ - - app/Resources/ - - main/admin/db.php - - main/admin/ldap_synchro.php - - main/chat/emoji_strategy.php - - main/document/Wami.swf - - main/fonts/ - - main/inc/ajax/Wami.swf - - main/inc/lib/browser/ - - main/inc/lib/internationalization_database/ - - main/inc/lib/javascript/ - - main/inc/lib/kses-0.2.2/ - - main/inc/lib/mimetex/ - - main/inc/lib/nanogong/ - - main/inc/lib/nusoap/ - - main/inc/lib/opengraph/* - - main/inc/lib/ppt2png/ - - main/inc/lib/pear/ - - main/inc/lib/svg-edit/ - - main/inc/lib/swfobject/ - - main/inc/lib/wami-recorder/ - - main/inc/lib/xajax/ - - main/lp/packaging/ - - main/template/ - - main/lang/ + - public/main/admin/db.php + - public/main/admin/ldap_synchro.php + - public/main/chat/emoji_strategy.php + - public/main/document/Wami.swf + - public/main/fonts/ + - public/main/inc/ajax/Wami.swf + - public/main/inc/lib/browser/ + - public/main/inc/lib/internationalization_database/ + - public/main/inc/lib/javascript/ + - public/main/inc/lib/kses-0.2.2/ + - public/main/inc/lib/mimetex/ + - public/main/inc/lib/nanogong/ + - public/main/inc/lib/nusoap/ + - public/main/inc/lib/opengraph/* + - public/main/inc/lib/ppt2png/ + - public/main/inc/lib/pear/ + - public/main/inc/lib/svg-edit/ + - public/main/inc/lib/swfobject/ + - public/main/inc/lib/wami-recorder/ + - public/main/inc/lib/xajax/ + - public/main/lp/packaging/ + - public/main/template/ + - public/main/lang/ - public/libs/ - public/img/ - plugin/buycourses/src/Culqi/ diff --git a/.env b/.env index dd3cc37341..b7595fc0ab 100644 --- a/.env +++ b/.env @@ -32,10 +32,6 @@ APP_ENCRYPT_METHOD='{{APP_ENCRYPT_METHOD}}' APP_LOCALE='en' -## Example: '/chamilo2' - -APP_URL_APPEND='{{APP_URL_APPEND}}' - APP_MULTIPLE_ACCESS_URL='' ###< chamilo ### diff --git a/config/packages/assets.yaml b/config/packages/assets.yaml index d117811b65..7c9d2ea6d4 100644 --- a/config/packages/assets.yaml +++ b/config/packages/assets.yaml @@ -1,4 +1,4 @@ framework: assets: json_manifest_path: '%kernel.project_dir%/public/build/manifest.json' - base_path: '../../../../%env(APP_URL_APPEND)%/public/' + base_path: '../../../../public/' diff --git a/config/packages/fos_js_routing.yaml b/config/packages/fos_js_routing.yaml index 7a57d54c08..689345e4cc 100644 --- a/config/packages/fos_js_routing.yaml +++ b/config/packages/fos_js_routing.yaml @@ -1,2 +1,2 @@ fos_js_routing: - request_context_base_url: '%env(APP_URL_APPEND)%' + request_context_base_url: '/' diff --git a/config/services.yaml b/config/services.yaml index 0996c37dcb..4ffe1471e4 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -4,7 +4,6 @@ parameters: password_encryption: '%env(APP_ENCRYPT_METHOD)%' secret: '%env(APP_SECRET)%' locale: '%env(APP_LOCALE)%' - url_append: '%env(APP_URL_APPEND)%' installed: '%env(APP_INSTALLED)%' twig: form: @@ -16,10 +15,10 @@ parameters: mailer_user: admin@example.com mailer_password: null course_info_is_not_editable: false - sonata_media.cdn.host: '%env(APP_URL_APPEND)%/public/resource' + sonata_media.cdn.host: '/var/upload/media/' sonata_page.varnish.command: 'if [ ! -r "/etc/varnish/secret" ]; then echo "VALID ERROR :/"; else varnishadm -S /etc/varnish/secret -T 127.0.0.1:6082 {{ COMMAND }} "{{ EXPRESSION }}"; fi;' - router.request_context.base_url: '%env(APP_URL_APPEND)%' - asset.request_context.base_path: '%env(APP_URL_APPEND)%' +# router.request_context.base_url: '%env(APP_URL_APPEND)%' +# asset.request_context.base_path: '%env(APP_URL_APPEND)%' glide_config: source: 'oneup_flysystem.resources_filesystem' diff --git a/src/CoreBundle/Framework/Container.php b/src/CoreBundle/Framework/Container.php index da96e1293a..ecda985220 100644 --- a/src/CoreBundle/Framework/Container.php +++ b/src/CoreBundle/Framework/Container.php @@ -137,14 +137,6 @@ class Container return str_replace('\\', '/', realpath(__DIR__.'/../../../')).'/'; } - /** - * @return string - */ - public static function getUrlAppend() - { - return self::$container->get('kernel')->getUrlAppend(); - } - /** * @return string */ diff --git a/src/CoreBundle/Menu/NavBuilder.php b/src/CoreBundle/Menu/NavBuilder.php index a081c5f55c..27aa5a925b 100644 --- a/src/CoreBundle/Menu/NavBuilder.php +++ b/src/CoreBundle/Menu/NavBuilder.php @@ -329,11 +329,7 @@ class NavBuilder implements ContainerAwareInterface // Needed when loading legacy pages (inside main) $isLegacy = $container->get('request_stack')->getCurrentRequest()->get('load_legacy'); - $urlAppend = $container->getParameter('url_append'); $legacyIndex = ''; - if ($isLegacy) { - $legacyIndex = $urlAppend.'/public'; - } if ($site) { $pageManager = $container->get('sonata.page.manager.page'); diff --git a/src/Kernel.php b/src/Kernel.php index 88af6c9669..c122af21cc 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -106,14 +106,6 @@ class Kernel extends BaseKernel return !empty($this->getContainer()->getParameter('installed')); } - /** - * @return string - */ - public function getUrlAppend() - { - return $this->getContainer()->getParameter('url_append'); - } - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void { $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));