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

* ensure 'enable_dl' is set before using it;

Browse Source 
* ensured compatibility with old configuration files for the authentication mode.
This commit is contained in:
Loïc Chapeaux
2001-12-15 09:12:33 +00:00
parent 39847bef99
commit 41d3dedd5d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/common.lib.php3
View File

@@ -142,7 +142,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
* Loads the mysql extensions if it is not loaded yet * Loads the mysql extensions if it is not loaded yet
* staybyte - 26. June 2001 * staybyte - 26. June 2001
*/ */
if (((PMA_PHP_INT_VERSION >= 40000 && !@ini_get('safe_mode')) if (((PMA_PHP_INT_VERSION >= 40000 && !@ini_get('safe_mode') && @ini_get('enable_dl'))
|| (PMA_PHP_INT_VERSION > 30009 && !@get_cfg_var('safe_mode'))) || (PMA_PHP_INT_VERSION > 30009 && !@get_cfg_var('safe_mode')))
&& @function_exists('dl')) { && @function_exists('dl')) {
if (PMA_PHP_INT_VERSION < 40000) { if (PMA_PHP_INT_VERSION < 40000) {
@@ -319,6 +319,13 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
? '' ? ''
: ':' . $cfgServer['socket']; : ':' . $cfgServer['socket'];
// Ensures compatibility with old config files
if (!isset($cfgServer['auth_type'])) {
$cfgServer['auth_type'] = (isset($cfgServer['adv_auth']) && $cfgServer['adv_auth'])
? 'http'
: 'config';
}
// Gets the authentication library that fits the cfgServer settings // Gets the authentication library that fits the cfgServer settings
// and run authentication // and run authentication
include('./libraries/auth/' . $cfgServer['auth_type'] . '.auth.lib.php3'); include('./libraries/auth/' . $cfgServer['auth_type'] . '.auth.lib.php3');