From 248d12363d5d27cb6af28a40f898aab2f2e287a0 Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Wed, 14 Dec 2005 17:12:28 +0000 Subject: [PATCH] added check is_readable for user config file --- ChangeLog | 3 +++ libraries/Config.class.php | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 292f00f25..d5c0110d4 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-12-14 Sebastian Mendel + * libraries/Config.class.php: added check is_readable for user config file + 2005-12-14 Michal Čihař * libraries/config.default.php, Documentation.html: Transliterate invalid chars by default (RFE #1380255). diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 3eac3ef4b..752d3c77d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -382,6 +382,10 @@ class PMA_Config return false; } + if ( ! is_readable($source) ) { + die('Existing configuration file (' . $source . ') is not readable.'); + } + // Check for permissions (on platforms that support it): $perms = @stat($source); if (!($perms === FALSE) && ($perms['mode'] & 2)) { @@ -390,9 +394,9 @@ class PMA_Config // Refuse to work while there still might be some world writable dir: if (is_dir('./config')) { - die('Remove config directory before using phpMyAdmin!'); + die('Remove "./config" directory before using phpMyAdmin!'); } - + $this->source = trim($source); return true; }