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

No section for loading extensions.

Browse Source 
The dl has been deprecated long time and the code for it removed as well
so we can simplify loading much.
This commit is contained in:
Michal Čihař
2010-07-20 12:08:43 +02:00
parent 11e53fb141
commit 42532065ab
1 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libraries/charset_conversion.lib.php
View File

@@ -10,38 +10,6 @@ if (! defined('PHPMYADMIN')) {
exit; exit;
} }
/**
* Failure on loading recode/iconv extensions.
*/
function PMA_failRecoding() {
PMA_fatalError(__('Couldn\'t load the iconv or recode extension needed for charset conversion. Either configure PHP to enable these extensions or disable charset conversion in phpMyAdmin.'));
}
/**
* Loads the recode or iconv extensions if any of it is not loaded yet
*/
if ($cfg['RecodingEngine'] == 'recode') {
if (!@extension_loaded('recode')) {
PMA_failRecoding();
}
$PMA_recoding_engine = 'recode';
} elseif ($cfg['RecodingEngine'] == 'iconv') {
if (!@extension_loaded('iconv')) {
PMA_failRecoding();
}
$PMA_recoding_engine = 'iconv';
} elseif ($cfg['RecodingEngine'] == 'auto') {
if (@extension_loaded('iconv')) {
$PMA_recoding_engine = 'iconv';
} elseif (@extension_loaded('recode')) {
$PMA_recoding_engine = 'recode';
} else {
$PMA_recoding_engine = 'none';
}
} else {
$PMA_recoding_engine = 'none';
}
define('PMA_CHARSET_NONE', 0); define('PMA_CHARSET_NONE', 0);
define('PMA_CHARSET_ICONV', 1); define('PMA_CHARSET_ICONV', 1);
define('PMA_CHARSET_LIBICONV', 2); define('PMA_CHARSET_LIBICONV', 2);
@@ -53,7 +21,7 @@ if (!isset($cfg['IconvExtraParams'])) {
} }
// Finally detect which function we will use: // Finally detect which function we will use:
if ($PMA_recoding_engine == 'iconv') { if ($cfg['RecodingEngine'] == 'iconv') {
if (@function_exists('iconv')) { if (@function_exists('iconv')) {
if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) { if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
$PMA_recoding_engine = PMA_CHARSET_ICONV_AIX; $PMA_recoding_engine = PMA_CHARSET_ICONV_AIX;
@@ -72,7 +40,7 @@ if ($PMA_recoding_engine == 'iconv') {
require_once './libraries/footer.inc.php'; require_once './libraries/footer.inc.php';
exit(); exit();
} }
} elseif ($PMA_recoding_engine == 'recode') { } elseif ($cfg['RecodingEngine'] == 'recode') {
if (@function_exists('recode_string')) { if (@function_exists('recode_string')) {
$PMA_recoding_engine = PMA_CHARSET_RECODE; $PMA_recoding_engine = PMA_CHARSET_RECODE;
} else { } else {
@@ -83,7 +51,7 @@ if ($PMA_recoding_engine == 'iconv') {
require_once './libraries/footer.inc.php'; require_once './libraries/footer.inc.php';
exit; exit;
} }
} else { } elseif ($cfg['RecodingEngine'] == 'auto') {
if (@function_exists('iconv')) { if (@function_exists('iconv')) {
if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) { if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
$PMA_recoding_engine = PMA_CHARSET_ICONV_AIX; $PMA_recoding_engine = PMA_CHARSET_ICONV_AIX;
@@ -102,6 +70,8 @@ if ($PMA_recoding_engine == 'iconv') {
require_once './libraries/footer.inc.php'; require_once './libraries/footer.inc.php';
exit; exit;
} }
} else {
$PMA_recoding_engine = PMA_CHARSET_NONE;
} }
/* Load AIX iconv wrapper if needed */ /* Load AIX iconv wrapper if needed */