Skip to content

[5.0] Make the includes check easier to read #41053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 8 commits into from
Aug 21, 2023
Merged

[5.0] Make the includes check easier to read #41053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e6a7e95
Make the includes check easier to read
laoneo Jun 26, 2023
0a6b1a1
Update includes/framework.php
laoneo Jun 26, 2023
9fcb579
Update administrator/includes/framework.php
laoneo Jun 26, 2023
b129c8d
Merge branch '5.0-dev' into includes/simplify
laoneo Jun 26, 2023
3584056
relative
laoneo Jun 26, 2023
c1b0590
Merge branch '5.0-dev' into includes/simplify
laoneo Jun 28, 2023
76d6a17
Merge branch '5.0-dev' into includes/simplify
laoneo Jun 29, 2023
30b64bf
Merge branch '5.0-dev' into includes/simplify
laoneo Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions administrator/includes/framework.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,27 @@
// System includes
require_once JPATH_LIBRARIES . '/bootstrap.php';

// Installation check, and check on removal of the install directory.
// Installation check, and check on removal of the install directory
if (
!file_exists(JPATH_CONFIGURATION . '/configuration.php')
|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
|| (file_exists(JPATH_INSTALLATION . '/index.php') && (false === (new Version())->isInDevelopmentState()))
) {
if (file_exists(JPATH_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 {
if (!file_exists(JPATH_INSTALLATION . '/index.php')) {
echo 'No configuration file found and no installation code available. Exiting...';

exit;
}

if (JPATH_ROOT === JPATH_PUBLIC) {
header('Location: ../installation/index.php');

exit;
}

echo 'Installation from a public folder is not supported, revert your Server configuration to point at Joomla\'s root folder to continue.';

exit;
}

// Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
Expand Down
20 changes: 11 additions & 9 deletions includes/framework.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,27 @@
// System includes
require_once JPATH_LIBRARIES . '/bootstrap.php';

// Installation check, and check on removal of the install directory.
// Installation check, and check on removal of the install directory
if (
!file_exists(JPATH_CONFIGURATION . '/configuration.php')
|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
|| (file_exists(JPATH_INSTALLATION . '/index.php') && (false === (new Version())->isInDevelopmentState()))
) {
if (file_exists(JPATH_INSTALLATION . '/index.php')) {
if (JPATH_ROOT === JPATH_PUBLIC) {
header('Location: ' . substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')) . '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.';
}
if (!file_exists(JPATH_INSTALLATION . '/index.php')) {
echo 'No configuration file found and no installation code available. Exiting...';

exit;
} else {
echo 'No configuration file found and no installation code available. Exiting...';
}

if (JPATH_ROOT === JPATH_PUBLIC) {
header('Location: ' . substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')) . 'installation/index.php');

exit;
}

echo 'Installation from a public folder is not supported, revert your Server configuration to point at Joomla\'s root folder to continue.';

exit;
}

// Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
Expand Down