Changeset:
6d6b5bab1c14
https://sourceforge.net/p/mrbs/hg-code/ci/6d6b5bab1c14cb0a966ca7f1ce77531a019a1f50
Author:
John Beranek <[email protected]>
Date:
Sat Sep 24 21:32:08 2016 +0100
Log message:
Fixed db_ext auth scheme, and a syntax method in DB_mysql
diffstat:
web/auth/auth_db_ext.inc | 15 ++++++++-------
web/lib/MRBS/DB_mysql.php | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diffs (44 lines):
diff -r f24a6d49742e -r 6d6b5bab1c14 web/auth/auth_db_ext.inc
--- a/web/auth/auth_db_ext.inc Sat Sep 24 21:18:52 2016 +0100
+++ b/web/auth/auth_db_ext.inc Sat Sep 24 21:32:08 2016 +0100
@@ -16,6 +16,7 @@
*
******************************************************************************/
+global $auth;
if (empty($auth['db_ext']['db_system']))
{
@@ -25,13 +26,13 @@
$persist = 0;
$port = isset($auth['db_ext']['db_port']) ? (int)$auth['db_ext']['db_port'] :
NULL;
-static $db_ext_conn = DBFactory::create($auth['db_ext']['db_system'],
- $auth['db_ext']['db_host'],
- $auth['db_ext']['db_username'],
- $auth['db_ext']['db_password'],
- $auth['db_ext']['db_name'],
- $persist,
- $port);
+$db_ext_conn = DBFactory::create($auth['db_ext']['db_system'],
+ $auth['db_ext']['db_host'],
+ $auth['db_ext']['db_username'],
+ $auth['db_ext']['db_password'],
+ $auth['db_ext']['db_name'],
+ $persist,
+ $port);
/* authValidateUser($user, $pass)
diff -r f24a6d49742e -r 6d6b5bab1c14 web/lib/MRBS/DB_mysql.php
--- a/web/lib/MRBS/DB_mysql.php Sat Sep 24 21:18:52 2016 +0100
+++ b/web/lib/MRBS/DB_mysql.php Sat Sep 24 21:32:08 2016 +0100
@@ -241,7 +241,7 @@
// NB: This function is also assumed to do a strict comparison, ie
// take account of training spaces. (The '=' comparison in MySQL allows
// trailing spaces, eg 'john' = 'john ').
- public function casesensitive_equals($fieldname, $string, &$params)
+ public function syntax_casesensitive_equals($fieldname, $string, &$params)
{
$params[] = $string;
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
