mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

PDO workaround for DB resource loss after connecting to otherdb

Browse Source
This commit is contained in:
Deltik
2013-05-04 00:17:15 -05:00
parent 086e8c3afc
commit 0b6cd1dc97
1 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
e107_plugins/alt_auth/otherdb_auth.php
View File

@@ -81,6 +81,21 @@ class auth_login extends alt_auth_base
*/ */
public function login($uname, $pword, &$newvals, $connect_only = FALSE) public function login($uname, $pword, &$newvals, $connect_only = FALSE)
{ {
/* Begin - Deltik's PDO Workaround (part 1/2) */
$dsn = 'mysql:dbname=' . $this->conf['otherdb_database'] . ';host=' . $this->conf['otherdb_server'];
try
{
$dbh = new PDO($dsn, $this->conf['otherdb_username'], $this->conf['otherdb_password']);
}
catch (PDOException $e)
{
$this->makeErrorText('Cannot connect to remote DB; PDOException message: ' . $e->getMessage());
return AUTH_NOCONNECT;
}
/* End - Deltik's PDO Workaround (part 1/2) */
/** Ancient code that breaks e107's ability to use the original MySQL resource
//Attempt to open connection to sql database //Attempt to open connection to sql database
if(!$res = mysql_connect($this->conf['otherdb_server'], $this->conf['otherdb_username'], $this->conf['otherdb_password'])) if(!$res = mysql_connect($this->conf['otherdb_server'], $this->conf['otherdb_username'], $this->conf['otherdb_password']))
{ {
@@ -94,6 +109,8 @@ class auth_login extends alt_auth_base
$this->makeErrorText('Cannot connect to remote DB'); $this->makeErrorText('Cannot connect to remote DB');
return AUTH_NOCONNECT; return AUTH_NOCONNECT;
} }
*/
if ($connect_only) return AUTH_SUCCESS; // Test mode may just want to connect to the DB if ($connect_only) return AUTH_SUCCESS; // Test mode may just want to connect to the DB
$sel_fields = array(); $sel_fields = array();
// Make an array of the fields we want from the source DB // Make an array of the fields we want from the source DB
@@ -111,10 +128,24 @@ class auth_login extends alt_auth_base
$sel_fields[] = $this->conf['otherdb_salt_field']; $sel_fields[] = $this->conf['otherdb_salt_field'];
} }
//Get record containing supplied login name //Get record containing supplied login name
$qry = "SELECT ".implode(',',$sel_fields)." FROM {$this->conf['otherdb_table']} WHERE {$user_field} = '{$uname}'"; $qry = "SELECT ".implode(',',$sel_fields)." FROM {$this->conf['otherdb_table']} WHERE {$user_field} = '{$uname}'";
// echo "Query: {$qry}<br />"; // echo "Query: {$qry}<br />";
/* Begin - Deltik's PDO Workaround (part 2/2) */
if (!$r1 = $dbh->query($qry))
{
$this->makeErrorText('Lookup query failed');
return AUTH_NOCONNECT;
}
if (!$row = $r1->fetch(PDO::FETCH_BOTH))
{
$this->makeErrorText('User not found');
return AUTH_NOUSER;
}
/* End - Deltik's PDO Workaround (part 2/2) */
/** Ancient code that breaks e107's ability to use the original MySQL resource
if(!$r1 = mysql_query($qry)) if(!$r1 = mysql_query($qry))
{ {
mysql_close($res); mysql_close($res);
@@ -128,7 +159,7 @@ class auth_login extends alt_auth_base
return AUTH_NOUSER; return AUTH_NOUSER;
} }
mysql_close($res); // Finished with 'foreign' DB now mysql_close($res);*/ // Finished with 'foreign' DB now
// Got something from the DB - see whether password valid // Got something from the DB - see whether password valid
require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); // This auto-loads the 'standard' password handler as well require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); // This auto-loads the 'standard' password handler as well
@@ -163,4 +194,4 @@ class auth_login extends alt_auth_base
} }
} }
?> ?>