From f207f7bb583c05a5010f88ad18dac17dc9947306 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 18 Nov 2007 14:18:00 +0000 Subject: [PATCH] bug #1759194 [import] open_basedir warning --- ChangeLog | 1 + libraries/file_listing.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e80cfa4f8..dadb6622d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA keys and AUTO_INCREMENT - [display] Division by zero when showing all records (page selector) - bug #1828265 [privileges] No weird characters in generated password +- bug #1759194 [import] open_basedir warning 2.11.2.1 (2007-11-11) - fixed possible SQL injection using database name diff --git a/libraries/file_listing.php b/libraries/file_listing.php index 78dda2b73..46028f5ae 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -22,7 +22,9 @@ function PMA_getDirContent($dir, $expression = '') $dir .= '/'; } while ($file = @readdir($handle)) { - if (is_file($dir . $file) && ($expression == '' || preg_match($expression, $file))) { + // for PHP < 5.2.4, is_file() gives a warning when using open_basedir + // and opening '..' + if ('..' != $file && is_file($dir . $file) && ($expression == '' || preg_match($expression, $file))) { $result[] = $file; } }