Fixed DNET-92 and DNET-93.

FirebirdSQL · Jun 9, 2007 · 1342400 · 1342400
1 parent b21822f
commit 1342400
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/WebProviders/source/FirebirdSql/Web/Providers/FbMembershipProvider.cs b/WebProviders/source/FirebirdSql/Web/Providers/FbMembershipProvider.cs
@@ -1065,12 +1065,12 @@ public override int GetNumberOfUsersOnline()
                     cmd.CommandType = CommandType.StoredProcedure;
                     cmd.Parameters.Add("@ApplicationName", FbDbType.VarChar, 100).Value = ApplicationName;
                     cmd.Parameters.Add("@SinceLastInActive", FbDbType.TimeStamp).Value = compareTime;
-                    
+
                     FbParameter p = new FbParameter("@NUMBERUSERS", FbDbType.Integer);
                     p.Direction = ParameterDirection.Output;
                     cmd.Parameters.Add(p);
                     cmd.ExecuteNonQuery();
-                    
+
                     return (p.Value != null) ? ((int)p.Value) : -1;
                 }
             }
@@ -1394,7 +1394,7 @@ private bool CheckPassword(string username, string password, bool updateLastLogi
                     cmd.Parameters.Add("@PasswordAttemptWindow", FbDbType.Integer).Value = PasswordAttemptWindow;
                     cmd.Parameters.Add("@LastLoginDate", FbDbType.TimeStamp).Value = isPasswordCorrect ? dtNow : lastLoginDate;
                     cmd.Parameters.Add("@LastActivityDate", FbDbType.TimeStamp).Value = isPasswordCorrect ? dtNow : lastActivityDate;
-                    
+
                     FbParameter p = new FbParameter("@RETURNCODE", FbDbType.Integer);
                     p.Direction = ParameterDirection.Output;
                     cmd.Parameters.Add(p);
@@ -1432,7 +1432,6 @@ private bool CheckPassword(string username, string password, bool updateLastLogi
                     cmd.Parameters.Add("@UpdateLastLoginActivityDate", FbDbType.Integer).Value = updateLastLoginActivityDate;
                     using (FbDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
-                        status = -1;
                         if (reader.Read())
                         {
                             password = reader.GetString(0);
@@ -1443,6 +1442,7 @@ private bool CheckPassword(string username, string password, bool updateLastLogi
                             isApproved = GetNullableBool(reader, 5);
                             lastLoginDate = GetNullableDateTime(reader, 6);
                             lastActivityDate = GetNullableDateTime(reader, 7);
+                            status = GetNullableInt(reader, 8);
                         }
                         else
                         {
@@ -1454,6 +1454,7 @@ private bool CheckPassword(string username, string password, bool updateLastLogi
                             isApproved = false;
                             lastLoginDate = DateTime.UtcNow;
                             lastActivityDate = DateTime.UtcNow;
+                            status = -1;
                         }
                     }
                 }
@@ -1488,13 +1489,14 @@ private bool CheckPassword(string username, string password, bool updateLastLogi
                         {
                             password = reader.GetString(0);
                             passwordFormat = reader.GetInt32(1);
+                            status = GetNullableInt(reader, 2);
                         }
                         else
                         {
                             password = null;
                             passwordFormat = 0;
+                            status = -1;
                         }
-                        status = GetNullableInt(reader, 2);
                     }
                 }
             }