arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Fix the login so it authenticates on the right record -- there is probably other stuff wrong if this is happening, but this is the easiest fix for now. There should never be two records in the users table with the same username/emailaddress, it should use the multi-role stuff... but this change will also work with multi-role anyways once the cause of this is fixed (registering as a volunteer when you're already a committee member creates a new record in the users table, instead of attaching you to the old one).

Browse Source
This commit is contained in:
james 2007-12-11 19:13:11 +00:00
parent 5d81818815
commit 08f5d64179
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
user_login.php
View File

@ -26,7 +26,7 @@
require_once("common.inc.php"); require_once("common.inc.php");
require_once("user.inc.php"); require_once("user.inc.php");
function try_login($user, $pass) function try_login($user, $pass, $type=null)
{ {
/* Ensure sanity of inputs, user should be an email address, but it's stored /* Ensure sanity of inputs, user should be an email address, but it's stored
* in the username field */ * in the username field */
@ -40,10 +40,12 @@
//$x = user_valid_password($pass); //$x = user_valid_password($pass);
if(!strlen($pass)) if(!strlen($pass))
return false; return false;
if($type) $typequery=" AND types LIKE '%$type%'"; else $typequery="";
$q = mysql_query("SELECT id,username,password $q = mysql_query("SELECT id,username,password
FROM users FROM users
WHERE username='$user' WHERE username='$user'
$typequery
AND deleted='no'"); AND deleted='no'");
echo mysql_error(); echo mysql_error();
if(mysql_num_rows($q) != 1) return false; if(mysql_num_rows($q) != 1) return false;
@ -101,7 +103,7 @@
{ {
if($_POST['pass'] && $_POST['user']) if($_POST['pass'] && $_POST['user'])
{ {
$id = try_login($_POST['user'], $_POST['pass']); $id = try_login($_POST['user'], $_POST['pass'],$type);
if($id == false) { if($id == false) {
header("location: user_login.php?type=$type&notice=login_failed"); header("location: user_login.php?type=$type&notice=login_failed");
exit; exit;