Move files inside public, update CI paths, remove APP_URL_APPEND calls

.php_cs.dist

@@ -40,20 +40,20 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude('assets')
     ->exclude('bin')
     ->exclude('documentation')
-    ->exclude('main/inc/lib/internationalization_database')
+    ->exclude('public/main/inc/lib/internationalization_database')
-    ->exclude('main/inc/lib/javascript')
+    ->exclude('public/main/inc/lib/javascript')
-    ->exclude('main/inc/lib/kses-0.2.2')
+    ->exclude('public/main/inc/lib/kses-0.2.2')
-    ->exclude('main/inc/lib/mimetex')
+    ->exclude('public/main/inc/lib/mimetex')
-    ->exclude('main/inc/lib/nusoap')
+    ->exclude('public/main/inc/lib/nusoap')
-    ->exclude('main/inc/lib/opengraph')
+    ->exclude('public/main/inc/lib/opengraph')
-    ->exclude('main/inc/lib/ppt2png')
+    ->exclude('public/main/inc/lib/ppt2png')
-    ->exclude('main/inc/lib/pear')
+    ->exclude('public/main/inc/lib/pear')
-    ->exclude('main/inc/lib/svg-edit')
+    ->exclude('public/main/inc/lib/svg-edit')
-    ->exclude('main/inc/lib/wami-recorder')
+    ->exclude('public/main/inc/lib/wami-recorder')
-    ->exclude('main/inc/lib/xajax')
+    ->exclude('public/main/inc/lib/xajax')
-    ->exclude('main/lp/packaging')
+    ->exclude('public/main/lp/packaging')
-    ->exclude('main/template')
+    ->exclude('public/main/template')
-    ->exclude('main/lang')
+    ->exclude('public/main/lang')
     ->exclude('plugin/buycourses/src/Culqi')
     ->exclude('plugin/buycourses/src/Requests')
     ->exclude('plugin/vchamilo/cli')
@@ -69,10 +69,10 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude('vendor')
     ->exclude('web')
 
-    ->notPath('main/admin/db.php')
+    ->notPath('public/main/admin/db.php')
     ->notPath('public/check.php')
-    ->notPath('main/admin/ldap_synchro.php')
+    ->notPath('public/main/admin/ldap_synchro.php')
-    ->notPath('main/chat/emoji_strategy.php')
+    ->notPath('public/main/chat/emoji_strategy.php')
     ->in(__DIR__)
 ;
 

README.md

@@ -64,11 +64,6 @@ Then make sure your database supports large prefixes (see [this Stack Overflow t
 Load the (your-domain)/main/install/index.php URL to start the installer (which is very similar to the installer in previous versions). 
 If the installer is pure-HTML and doesn't appear with a clean layout, that's because you didn't follow these instructions carefully. 
 Go back to the beginning of this section and try again.
-
-Finally, if you are installing this development version in a subdirectory, you will need to add "the folder" in the ".env" file in the root folder:
-```
-APP_URL_APPEND=the-folder
-```
  
 ## Changes from 1.x
 

public/main/inc/global.inc.php

@@ -31,7 +31,6 @@ try {
     }
 
     $env = $_SERVER['APP_ENV'] ?? 'dev';
-    $append = $_SERVER['APP_URL_APPEND'] ?? '';
 
     $kernel = new Chamilo\Kernel($env, true);
     // Loading Request from Sonata. In order to use Sonata Pages Bundle.
@@ -44,22 +43,11 @@ try {
     // @todo fix URL loading
     $request->setBaseUrl($request->getRequestUri());
     $kernel->boot();
-    if (!empty($append)) {
-        if (substr($append, 0, 1) !== '/') {
-            echo 'APP_URL_APPEND must start with "/"';
-            exit;
-        }
-        $append = "$append/";
-        $append .= 'public';
-    } else {
-        $append .= '/public';
-    }
 
     $container = $kernel->getContainer();
     $router = $container->get('router');
     $context = $router->getContext();
 
-    $context->setBaseUrl($append);
     $router->setContext($context);
     $response = $kernel->handle($request);
     $context = Container::getRouter()->getContext();

public/main/inc/lib/api.lib.php

@@ -829,7 +829,7 @@ function api_get_path($path = '', $configuration = [])
     }
 
     $isInitialized = [];
-    $root_rel = $_SERVER['APP_URL_APPEND'] ?? '';
+    $root_rel = '';
 
     if (!empty($root_rel)) {
         // Adds "/" to the root_rel

public/main/inc/lib/diagnoser.lib.php

@@ -127,7 +127,7 @@ class Diagnoser
     {
         global $paths;
         $list = $paths[api_get_path(WEB_PATH)];
-        $list['url_append'] = api_get_configuration_value('url_append');
+        //$list['url_append'] = api_get_configuration_value('url_append');
         asort($list);
 
         return [

public/main/install/configuration.dist.php

@@ -36,10 +36,6 @@ $_configuration['db_manager_enabled'] = false;
 // Path to the webroot of system, example: /var/www/
 $_configuration['root_sys'] = '{ROOT_SYS}';
 
-// Path from your WWW-root to the root of your Chamilo installation,
-// example: chamilo (this means chamilo is installed in /var/www/chamilo/
-$_configuration['url_append'] = '{URL_APPEND_PATH}';
-
 /**
  * Hosting settings - Allows you to set limits to the Chamilo portal when
  * hosting it for a third party. These settings can be overwritten by an

public/main/install/index.php

@@ -44,7 +44,6 @@ ob_implicit_flush(true);
 
 // Defaults settings
 putenv('APP_LOCALE=en');
-putenv('APP_URL_APPEND=""');
 putenv('APP_ENCRYPT_METHOD="bcrypt"');
 putenv('DATABASE_HOST=');
 putenv('DATABASE_PORT=');
@@ -572,7 +571,6 @@ if (isset($_POST['step2'])) {
             '{{DATABASE_PASSWORD}}' => $dbPassForm,
             '{{APP_INSTALLED}}' => 1,
             '{{APP_ENCRYPT_METHOD}}' => $encryptPassForm,
-            '{{APP_URL_APPEND}}' => $urlAppendPath,
             '{{APP_SECRET}}' => generateRandomToken(),
         ];
 
@@ -633,7 +631,6 @@ if (isset($_POST['step2'])) {
             '{{DATABASE_PASSWORD}}' => $dbPassForm,
             '{{APP_INSTALLED}}' => 1,
             '{{APP_ENCRYPT_METHOD}}' => $encryptPassForm,
-            '{{APP_URL_APPEND}}' => $urlAppendPath,
             '{{APP_SECRET}}' => generateRandomToken(),
         ];
 

public/main/install/install.lib.php

@@ -2840,7 +2840,6 @@ function updateEnvFile($distFile, $envFile, $params)
         'DATABASE_PASSWORD',
         'APP_INSTALLED',
         'APP_ENCRYPT_METHOD',
-        'APP_URL_APPEND',
     ];
 
     foreach ($requirements as $requirement) {