Skip to content

Refactor of paths detection #36

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
merged 2 commits into from
Mar 30, 2016
Merged

Refactor of paths detection #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f96c72
Refactor of paths detection
vonalbert Mar 29, 2016
19510a5
Realpath check before is_dir
vonalbert Mar 29, 2016
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
53 changes: 14 additions & 39 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,27 +101,22 @@
* ---------------------------------------------------------------
*/

// Set the current directory correctly for CLI requests
if (defined('STDIN'))
{
chdir(__DIR__);
}
// Ensure the current directory is pointing to the front controller's directory
chdir(__DIR__);

if (($_temp = realpath($system_path)) !== false)
{
$system_path = $_temp.'/';
}
else
// Are the system and application paths correct?
if ( ! realpath($system_path) OR ! is_dir($system_path))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added this to ensure $system_path (and $application_folder below) have executable permissions

{
// Ensure there's a trailing slash
$system_path = rtrim($system_path, '/').'/';
header('HTTP/1.1 503 Service Unavailable.', true, 503);
echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.
pathinfo(__FILE__, PATHINFO_BASENAME);
exit(3); // EXIT_CONFIG
}

// Is the system path correct?
if ( ! is_dir($system_path))
if ( ! realpath($application_folder) OR ! is_dir($application_folder))
{
header('HTTP/1.1 503 Service Unavailable.', true, 503);
echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.
echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.
pathinfo(__FILE__, PATHINFO_BASENAME);
exit(3); // EXIT_CONFIG
}
Expand All @@ -137,36 +132,16 @@
define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));

// Path to the system folder
define('BASEPATH', realpath(str_replace('\\', '/', $system_path)).DIRECTORY_SEPARATOR);
define('BASEPATH', realpath($system_path).DIRECTORY_SEPARATOR);

// Path to the front controller (this file)
define('FCPATH', realpath(__DIR__).DIRECTORY_SEPARATOR);
define('FCPATH', __DIR__.DIRECTORY_SEPARATOR);

// Path to the writable directory.
define('WRITEPATH', realpath(str_replace('\\', '/', $writable_directory)).DIRECTORY_SEPARATOR);
define('WRITEPATH', realpath($writable_directory).DIRECTORY_SEPARATOR);

// The path to the "application" folder
if (is_dir($application_folder))
{
if (($_temp = realpath($application_folder)) !== false)
{
$application_folder = $_temp;
}

define('APPPATH', realpath($application_folder).DIRECTORY_SEPARATOR);
}
else
{
if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
{
header('HTTP/1.1 503 Service Unavailable.', true, 503);
echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.
SELF;
exit(3); // EXIT_CONFIG
}

define('APPPATH', realpath(BASEPATH.$application_folder).DIRECTORY_SEPARATOR);
}
define('APPPATH', realpath($application_folder).DIRECTORY_SEPARATOR);

/*
* --------------------------------------------------------------------
Expand Down