nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix parsing of paths containing : (patch #1461766).

Browse Source
This commit is contained in:
Michal Čihař
2006-04-11 16:41:18 +00:00
parent befe976bcc
commit 0728242790
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -21,6 +21,8 @@ $Source$
2006-04-11 Michal Čihař <michal@cihar.com> 2006-04-11 Michal Čihař <michal@cihar.com>
* lang/galician: Fix missing ; (bug #1468439). * lang/galician: Fix missing ; (bug #1468439).
* libraries/Config.class.php: Fix parsing of paths containing : (patch
#1461766).
2006-04-10 Michal Čihař <michal@cihar.com> 2006-04-10 Michal Čihař <michal@cihar.com>
* libraries/Config.class.php: Check also default config mtime (bug * libraries/Config.class.php: Check also default config mtime (bug

21
libraries/Config.class.php
View File

@@ -512,9 +512,12 @@ class PMA_Config
if (strlen($pma_absolute_uri) < 1) { if (strlen($pma_absolute_uri) < 1) {
$url = array(); $url = array();
// At first we try to parse REQUEST_URI, it might contain full URI // At first we try to parse REQUEST_URI, it might contain full URL
if (PMA_getenv('REQUEST_URI')) { if (PMA_getenv('REQUEST_URI')) {
$url = parse_url(PMA_getenv('REQUEST_URI')); $url = @parse_url(PMA_getenv('REQUEST_URI')); // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/'
if ($url === false) {
$url = array( 'path' => $_SERVER['REQUEST_URI'] );
}
} }
// If we don't have scheme, we didn't have full URL so we need to // If we don't have scheme, we didn't have full URL so we need to
@@ -702,9 +705,12 @@ class PMA_Config
$url = array(); $url = array();
// At first we try to parse REQUEST_URI, it might contain full URI // At first we try to parse REQUEST_URI, it might contain full URL,
if (PMA_getenv('REQUEST_URI')) { if (PMA_getenv('REQUEST_URI')) {
$url = parse_url(PMA_getenv('REQUEST_URI')); $url = @parse_url(PMA_getenv('REQUEST_URI')); // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/'
if($url === false) {
$url = array();
}
} }
// If we don't have scheme, we didn't have full URL so we need to // If we don't have scheme, we didn't have full URL so we need to
@@ -769,9 +775,12 @@ class PMA_Config
} }
} }
$url = parse_url($url); $parsed_url = @parse_url($_SERVER['REQUEST_URI']); // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/'
if ($parsed_url === false) {
$parsed_url = array('path' => $url);
}
$cookie_path = substr($url['path'], 0, strrpos($url['path'], '/')) . '/'; $cookie_path = substr($parsed_url['path'], 0, strrpos($parsed_url['path'], '/')) . '/';
return $cookie_path; return $cookie_path;
} }