mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

[ticket/10848] Redirect from adm to installer correctly.

Browse Source 
PHPBB3-10848
This commit is contained in:
Oleg Pudeyev
2012-10-17 15:03:06 -04:00
parent f0544c884f
commit c630480ca1
3 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/common.php
View File

@@ -38,10 +38,14 @@ if (!defined('PHPBB_INSTALLED'))
$script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
}
// $phpbb_root_path accounts for redirects from e.g. /adm
$script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/index.' . $phpEx;
// Replace any number of consecutive backslashes and/or slashes with a single slash
// (could happen on some proxy setups and/or Windows servers)
$script_path = trim(dirname($script_name)) . '/install/index.' . $phpEx;
$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
// Eliminate . and .. from the path
require($phpbb_root_path . 'includes/functions.' . $phpEx);
$script_path = clean_path($script_path);
$url = (($secure) ? 'https://' : 'http://') . $server_name;

30
phpBB/includes/functions.php
View File

@@ -1176,6 +1176,36 @@ else
}
}
/**
* Eliminates useless . and .. components from specified path.
*
* @param string $path Path to clean
* @return string Cleaned path
*/
function clean_path($path)
{
$exploded = explode('/', $path);
$filtered = array();
foreach ($exploded as $part)
{
if ($part === '.' && !empty($filtered))
{
continue;
}
if ($part === '..' && !empty($filtered) && $filtered[sizeof($filtered) - 1] !== '..')
{
array_pop($filtered);
}
else
{
$filtered[] = $part;
}
}
$path = implode('/', $filtered);
return $path;
}
if (!function_exists('htmlspecialchars_decode'))
{
/**