Revision: 12827
http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12827&view=rev
Author: kink
Date: 2007-12-16 08:37:21 -0800 (Sun, 16 Dec 2007)
Log Message:
-----------
Let configtest.php use optional PEAR dynamic extension loading,
patch by Walter Huijbers (#1833123).
Modified Paths:
--------------
branches/SM-1_4-STABLE/squirrelmail/ChangeLog
branches/SM-1_4-STABLE/squirrelmail/src/configtest.php
Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog 2007-12-16 16:34:55 UTC
(rev 12826)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog 2007-12-16 16:37:21 UTC
(rev 12827)
@@ -7,6 +7,8 @@
- Added support for Macedonian.
- Don't allow invalid plugin names in conf.pl --install-plugin
- Fix warning in Printer Friendly due to missing include (#1849101).
+ - Let configtest.php use optional PEAR dynamic extension loading,
+ patch by Walter Huijbers (#1833123).
Version 1.4.13 - 14 December 2007
---------------------------------
Modified: branches/SM-1_4-STABLE/squirrelmail/src/configtest.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/configtest.php 2007-12-16
16:34:55 UTC (rev 12826)
+++ branches/SM-1_4-STABLE/squirrelmail/src/configtest.php 2007-12-16
16:37:21 UTC (rev 12827)
@@ -157,8 +157,15 @@
do_err('Required PHP extensions missing: '.implode(', ',$diff) );
}
-echo $IND . "PHP extensions OK.<br />\n";
+echo $IND . "PHP extensions OK. Dynamic loading is ";
+if (!(bool)ini_get('enable_dl') || (bool)ini_get('safe_mode')) {
+ echo "disabled.<br />\n";
+} else {
+ echo "enabled.<br />\n";
+}
+
+
/* dangerous php settings */
/** mbstring.func_overload<>0 fix. See cvs HEAD comments. */
if (function_exists('mb_internal_encoding') &&
@@ -520,22 +527,28 @@
foreach($dsns as $type => $dsn) {
$aDsn = explode(':', $dsn);
$dbtype = array_shift($aDsn);
+
if(isset($db_functions[$dbtype]) &&
function_exists($db_functions[$dbtype])) {
echo "$IND$dbtype database support present.<br />\n";
+ } elseif(!(bool)ini_get('enable_dl') ||
(bool)ini_get('safe_mode')) {
+ do_err($dbtype.' database support not present!');
+ } else {
+ // Non-fatal error
+ do_err($dbtype.' database support not present or not
configured!
+ Trying to dynamically load '.$dbtype.' extension.
+ Please note that it is advisable to not rely on dynamic
loading of extensions.', FALSE);
+ }
- // now, test this interface:
- $dbh = DB::connect($dsn, true);
- if (DB::isError($dbh)) {
- do_err('Database error: '.
htmlspecialchars(DB::errorMessage($dbh)) .
- ' in ' .$type .' DSN.');
- }
- $dbh->disconnect();
- echo "$IND$type database connect successful.<br />\n";
+ // now, test this interface:
- } else {
- do_err($dbtype.' database support not present!');
+ $dbh = DB::connect($dsn, true);
+ if (DB::isError($dbh)) {
+ do_err('Database error: '.
htmlspecialchars(DB::errorMessage($dbh)) .
+ ' in ' .$type .' DSN.');
}
+ $dbh->disconnect();
+ echo "$IND$type database connect successful.<br />\n";
}
} else {
$db_error='Required PHP PEAR DB support is not available.'
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@xxxxxxxxxxxxxxxx
List info (subscribe/unsubscribe/change options):
https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn
|
