- Fix dl() use in installer (#1486150): use is_readable() instead

release-0.6
alecpl 15 years ago
parent 0102742cb2
commit 3e2bc6a975

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail CHANGELOG RoundCube Webmail
=========================== ===========================
- Fix dl() use in installer (#1486150)
- Added 'ldap_debug' option - Added 'ldap_debug' option
- Fix "Empty startup greeting" bug (#1486085) - Fix "Empty startup greeting" bug (#1486085)
- Fix setting user name in 'new_user_identity' plugin (#1486137) - Fix setting user name in 'new_user_identity' plugin (#1486137)

@ -55,14 +55,17 @@ if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '>=')) {
<h3>Checking PHP extensions</h3> <h3>Checking PHP extensions</h3>
<p class="hint">The following modules/extensions are <em>required</em> to run RoundCube:</p> <p class="hint">The following modules/extensions are <em>required</em> to run RoundCube:</p>
<?php <?php
// get extensions location
$ext_dir = ini_get('extension_dir');
$prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : ''; $prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
foreach ($required_php_exts AS $name => $ext) { foreach ($required_php_exts AS $name => $ext) {
if (extension_loaded($ext)) { if (extension_loaded($ext)) {
$RCI->pass($name); $RCI->pass($name);
} else { } else {
$_ext = $prefix . $ext . '.' . PHP_SHLIB_SUFFIX; $_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
$msg = @dl($_ext) ? 'Could be loaded. Please add in php.ini' : ''; $msg = @is_readable($_ext) ? 'Could be loaded. Please add in php.ini' : '';
$RCI->fail($name, $msg, $source_urls[$name]); $RCI->fail($name, $msg, $source_urls[$name]);
} }
echo '<br />'; echo '<br />';
@ -78,8 +81,8 @@ foreach ($optional_php_exts AS $name => $ext) {
$RCI->pass($name); $RCI->pass($name);
} }
else { else {
$_ext = $prefix . $ext . '.' . PHP_SHLIB_SUFFIX; $_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
$msg = @dl($_ext) ? 'Could be loaded. Please add in php.ini' : ''; $msg = @is_readable($_ext) ? 'Could be loaded. Please add in php.ini' : '';
$RCI->na($name, $msg, $source_urls[$name]); $RCI->na($name, $msg, $source_urls[$name]);
} }
echo '<br />'; echo '<br />';
@ -99,8 +102,8 @@ foreach ($supported_dbs AS $database => $ext) {
$RCI->pass($database); $RCI->pass($database);
} }
else { else {
$_ext = $prefix . $ext . '.' . PHP_SHLIB_SUFFIX; $_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
$msg = @dl($_ext) ? 'Could be loaded. Please add in php.ini' : 'Not installed'; $msg = @is_readable($_ext) ? 'Could be loaded. Please add in php.ini' : 'Not installed';
$RCI->na($database, $msg, $source_urls[$database]); $RCI->na($database, $msg, $source_urls[$database]);
} }
echo '<br />'; echo '<br />';

Loading…
Cancel
Save