Changeset:
95a9fcbc9f69
https://sourceforge.net/p/mrbs/hg-code/ci/95a9fcbc9f69445d3675b26b93fdb2c4d922c7aa
Author:
John Beranek <[email protected]>
Date:
Fri Oct 02 11:38:14 2015 +0100
Log message:
A few minor changes to support the removal of the 'mysql' DB abstraction,
including support for the 'db_ext' auth scheme.
diffstat:
web/auth/auth_db_ext.inc | 7 +++++++
web/config.inc.php | 3 +--
web/systemdefaults.inc.php | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diffs (51 lines):
diff -r 1633eeb9e580 -r 95a9fcbc9f69 web/auth/auth_db_ext.inc
--- a/web/auth/auth_db_ext.inc Fri Oct 02 10:16:46 2015 +0100
+++ b/web/auth/auth_db_ext.inc Fri Oct 02 11:38:14 2015 +0100
@@ -18,6 +18,13 @@
// $Id$
+// We no longer have a 'mysql' abstraction, but to support people who upgrade
MRBS and used to
+// use the 'mysql' abstraction, we change the abstraction to the supported
'mysqli'.
+if ($auth['db_ext']['db_system'] == 'mysql')
+{
+ $auth['db_ext']['db_system'] = 'mysqli';
+}
+
/* authValidateUser($user, $pass)
*
diff -r 1633eeb9e580 -r 95a9fcbc9f69 web/config.inc.php
--- a/web/config.inc.php Fri Oct 02 10:16:46 2015 +0100
+++ b/web/config.inc.php Fri Oct 02 11:38:14 2015 +0100
@@ -39,8 +39,7 @@
/*******************
* Database settings
******************/
-// Which database system: "pgsql"=PostgreSQL, "mysql"=MySQL,
-// "mysqli"=MySQL via the mysqli PHP extension
+// Which database system: "pgsql"=PostgreSQL, "mysqli"=MySQL
$dbsys = "mysqli";
// Hostname of database server. For pgsql, can use "" instead of localhost
// to use Unix Domain Sockets instead of TCP/IP. For mysql/mysqli "localhost"
diff -r 1633eeb9e580 -r 95a9fcbc9f69 web/systemdefaults.inc.php
--- a/web/systemdefaults.inc.php Fri Oct 02 10:16:46 2015 +0100
+++ b/web/systemdefaults.inc.php Fri Oct 02 11:38:14 2015 +0100
@@ -59,7 +59,7 @@
// Which database system: "pgsql"=PostgreSQL, "mysqli"=MySQL
$dbsys = "mysqli";
// Hostname of database server. For pgsql, can use "" instead of localhost
-// to use Unix Domain Sockets instead of TCP/IP. For mysql/mysqli "localhost"
+// to use Unix Domain Sockets instead of TCP/IP. For mysqli "localhost"
// tells the system to use Unix Domain Sockets, and $db_port will be ignored;
// if you want to force TCP connection you can use "127.0.0.1".
$db_host = "localhost";
@@ -709,7 +709,7 @@
// db_ext authentication.
$auth['db_ext']['db_system'] = 'mysqli';
// Hostname of external database server. For pgsql, can use "" instead of
localhost
-// to use Unix Domain Sockets instead of TCP/IP. For mysql/mysqli "localhost"
+// to use Unix Domain Sockets instead of TCP/IP. For mysqli "localhost"
// tells the system to use Unix Domain Sockets, and $db_port will be ignored;
// if you want to force TCP connection you can use "127.0.0.1".
$auth['db_ext']['db_host'] = 'localhost';
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
