[5.0] Allow Joomla be served from a public* folder (#40509)

---------

Signed-off-by: Dimitris Grammatikogiannis <[email protected]>
Co-authored-by: Harald Leithner <[email protected]>

Author: dgrammatiko

administrator/includes/app.php

@@ -22,9 +22,13 @@
     require_once JPATH_BASE . '/includes/defines.php';
 }
 
+if (!defined('JPATH_PUBLIC')) {
+    define('JPATH_PUBLIC', JPATH_ROOT);
+}
+
 // Check for presence of vendor dependencies not included in the git repository
-if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_ROOT . '/media/vendor')) {
-    echo file_get_contents(JPATH_ROOT . '/templates/system/build_incomplete.html');
+if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_PUBLIC . '/media/vendor')) {
+    echo file_get_contents(JPATH_BASE . '/templates/system/build_incomplete.html');
 
     exit;
 }

administrator/includes/defines.php

@@ -16,6 +16,7 @@
 // Defines
 define('JPATH_ROOT', implode(DIRECTORY_SEPARATOR, $parts));
 define('JPATH_SITE', JPATH_ROOT);
+define('JPATH_PUBLIC', JPATH_ROOT);
 define('JPATH_CONFIGURATION', JPATH_ROOT);
 define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
 define('JPATH_LIBRARIES', JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');

administrator/includes/framework.php

@@ -22,7 +22,11 @@
     || (file_exists(JPATH_INSTALLATION . '/index.php') && (false === (new Version())->isInDevelopmentState()))
 ) {
     if (file_exists(JPATH_INSTALLATION . '/index.php')) {
-        header('Location: ../installation/index.php');
+        if (JPATH_ROOT === JPATH_PUBLIC) {
+            header('Location: ../installation/index.php');
+        } else {
+            echo 'Installation from a public folder is not supported, revert your Server configuration to point at the Joomla\'s root folder to continue.';
+        }
 
         exit();
     } else {

administrator/index.php

@@ -17,7 +17,7 @@
         str_replace(
             '{{phpversion}}',
             JOOMLA_MINIMUM_PHP,
-            file_get_contents(dirname(__FILE__) . '/../templates/system/incompatible.html')
+            file_get_contents(dirname(dirname(__FILE__)) . '/includes/incompatible.html')
         )
     );
 }

api/includes/app.php

@@ -22,6 +22,10 @@
     require_once JPATH_BASE . '/includes/defines.php';
 }
 
+if (!defined('JPATH_PUBLIC')) {
+    define('JPATH_PUBLIC', JPATH_ROOT);
+}
+
 require_once JPATH_BASE . '/includes/framework.php';
 
 // Set profiler start time and memory usage and mark afterLoad in the profiler.

api/includes/defines.php

@@ -16,6 +16,7 @@
 // Defines.
 define('JPATH_ROOT', implode(DIRECTORY_SEPARATOR, $parts));
 define('JPATH_SITE', JPATH_ROOT);
+define('JPATH_PUBLIC', JPATH_ROOT);
 define('JPATH_CONFIGURATION', JPATH_ROOT);
 define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
 define('JPATH_LIBRARIES', JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');

build/build-modules-js/error-pages.es6.js

@@ -147,14 +147,12 @@ module.exports.createErrorPages = async (options) => {
       await mkdir(dirname(`${RootPath}${options.settings.errorPages[name].destFile}`), { recursive: true, mode: 0o755 });
     }
 
-    await writeFile(
-      `${RootPath}${options.settings.errorPages[name].destFile}`,
-      template,
-      { encoding: 'utf8', mode: 0o644 },
-    );
+    options.settings.errorPages[name].destFile.forEach(async (folder) => {
+      await writeFile(`${RootPath}${folder}`, template, { encoding: 'utf8', mode: 0o644 });
 
-    // eslint-disable-next-line no-console
-    console.error(`✅ Created the file: ${options.settings.errorPages[name].destFile}`);
+      // eslint-disable-next-line no-console
+      console.error(`✅ Created the file: ${folder}`);
+    });
   };
 
   Object.keys(options.settings.errorPages).forEach((name) => processPages.push(processPage(name)));

build/build-modules-js/settings.json

@@ -798,31 +798,31 @@
         "text": "It looks like you are trying to run Joomla! from our git repository. To do so requires you complete a couple of extra steps first.",
         "link": "J4.x:Setting_Up_Your_Local_Environment",
         "linkText": "More Details",
-        "destFile": "/templates/system/build_incomplete.html"
+        "destFile": ["/templates/system/build_incomplete.html"]
       },
       "unsupported": {
         "title": "Joomla: unsupported PHP version",
         "header": "Sorry, your PHP version is not supported",
         "text": "Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla!",
         "link": "J4.x:Unsupported_PHP_Version",
         "linkText": "Help me resolve this",
-        "destFile": "/templates/system/incompatible.html"
+        "destFile": ["/templates/system/incompatible.html", "/includes/incompatible.html"]
       },
       "noxml": {
         "title": "Joomla: Missing PHP-XML library",
         "header": "Sorry, your PHP is missing a vital library",
         "text": "Your host needs to use PHP with support for the XML library to run this version of Joomla!",
         "link": "J4.x:Missing_XML_Library",
         "linkText": "Help me resolve this",
-        "destFile": "/media/system/html/noxml.html"
+        "destFile": ["/media/system/html/noxml.html"]
       },
       "fatal": {
         "title": "An Error Occurred: {{statusText}}",
         "header": "Sorry, there was a problem we could not recover from.",
         "text": "The server returned a \"{{statusCode_statusText}}\"",
         "link": "J4.x:FatalError",
         "linkText": "Help me resolve this",
-        "destFile": "/templates/system/fatal-error.html"
+        "destFile": ["/templates/system/fatal-error.html"]
       }
     }
   }

cli/joomla.php

@@ -43,6 +43,10 @@
     exit;
 }
 
+if (!defined('JPATH_PUBLIC')) {
+    define('JPATH_PUBLIC', JPATH_ROOT);
+}
+
 // Check if installed
 if (
     !file_exists(JPATH_CONFIGURATION . '/configuration.php')

includes/app.php

@@ -22,9 +22,13 @@
     require_once JPATH_BASE . '/includes/defines.php';
 }
 
+if (!defined('JPATH_PUBLIC')) {
+    define('JPATH_PUBLIC', JPATH_ROOT);
+}
+
 // Check for presence of vendor dependencies not included in the git repository
-if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_ROOT . '/media/vendor')) {
-    echo file_get_contents(JPATH_ROOT . '/templates/system/build_incomplete.html');
+if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_PUBLIC . '/media/vendor')) {
+    echo file_get_contents(JPATH_BASE . '/templates/system/build_incomplete.html');
 
     exit;
 }