projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Simple content restriction was not validated when it is in further reference.
[mono.git] / mcs / class / Mainsoft.Web / Mainsoft.Web.Security / DerbyMembershipHelper.cs
diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs
index da77309cb345949126c732e8562ec68e20dd2e93..c16c4bb9b0ba5dbf92d60a9a7f0752b436037c34 100644 (file)
--- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs
+++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs
@@ -106,7 +106,7 @@ namespace Mainsoft.Web.Security
                                        OleDbCommand cmdMbrEmail = new OleDbCommand (queryMbrEmail, (OleDbConnection) connection);\r
                                        cmdMbrEmail.Transaction = trans;\r
                                        AddParameter (cmdMbrEmail, "ApplicationId", applicationId);\r
-                                       AddParameter (cmdMbrEmail, "LoweredEmail", email.ToLower ());\r
+                                       AddParameter (cmdMbrEmail, "LoweredEmail", email.ToLowerInvariant ());\r
                                        using (OleDbDataReader reader = cmdMbrEmail.ExecuteReader ()) {\r
                                                if (reader.Read ()) {\r
                                                        trans.Rollback ();\r
@@ -139,7 +139,7 @@ namespace Mainsoft.Web.Security
                                AddParameter (cmdInsertMbr, "PasswordFormat", passwordFormat);\r
                                AddParameter (cmdInsertMbr, "PasswordSalt", passwordSalt);\r
                                AddParameter (cmdInsertMbr, "Email", email);\r
-                               AddParameter (cmdInsertMbr, "LoweredEmail", email != null ? email.ToLower () : null);\r
+                               AddParameter (cmdInsertMbr, "LoweredEmail", email != null ? email.ToLowerInvariant () : null);\r
                                AddParameter (cmdInsertMbr, "PasswordQuestion", pwdQuestion);\r
                                AddParameter (cmdInsertMbr, "PasswordAnswer", pwdAnswer);\r
                                AddParameter (cmdInsertMbr, "IsApproved", isApproved);\r
@@ -171,7 +171,7 @@ namespace Mainsoft.Web.Security
                                "FROM aspnet_Membership mbr, aspnet_Users usr " +\r
                                "WHERE usr.UserId = mbr.UserId AND mbr.LoweredEmail LIKE ? ORDER BY usr.LoweredUserName";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredEmail", emailToMatch.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredEmail", emailToMatch.ToLowerInvariant ());\r
                        reader = cmdSelect.ExecuteReader ();\r
                        return 0;\r
                }\r
@@ -183,7 +183,7 @@ namespace Mainsoft.Web.Security
                                "FROM aspnet_Membership mbr, aspnet_Users usr " +\r
                                "WHERE usr.UserId = mbr.UserId AND usr.LoweredUserName LIKE ? ORDER BY usr.LoweredUserName";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredUserName", userNameToMatch.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredUserName", userNameToMatch.ToLowerInvariant ());\r
                        reader = cmdSelect.ExecuteReader ();\r
                        return 0;\r
                }\r
@@ -201,14 +201,14 @@ namespace Mainsoft.Web.Security
 \r
                public static int Membership_GetNumberOfUsersOnline (DbConnection connection, string applicationName, int minutesSinceLastInActive, DateTime currentTimeUtc)\r
                {\r
-                       string queryUsersActive = "SELECT COUNT(*) FROM aspnet_Users usr, aspnet_Applications app, aspnet_Membership mbr " +
-                               "WHERE usr.ApplicationId = app.ApplicationId AND usr.LastActivityDate > ? AND " +
+                       string queryUsersActive = "SELECT COUNT(*) FROM aspnet_Users usr, aspnet_Applications app, aspnet_Membership mbr " +\r
+                               "WHERE usr.ApplicationId = app.ApplicationId AND usr.LastActivityDate > ? AND " +\r
                                "app.LoweredApplicationName = ? AND usr.UserId = mbr.UserId";\r
 \r
 \r
                        OleDbCommand cmdUsersActive = new OleDbCommand (queryUsersActive, (OleDbConnection) connection);\r
                        AddParameter (cmdUsersActive, "LastActivityDate", currentTimeUtc.AddMinutes (-minutesSinceLastInActive));\r
-                       AddParameter (cmdUsersActive, "LoweredApplicationName", applicationName.ToLower ());\r
+                       AddParameter (cmdUsersActive, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
                        using (OleDbDataReader reader = cmdUsersActive.ExecuteReader ()) {\r
                                if (reader.Read ())\r
                                        return reader.GetInt32 (0);\r
@@ -224,8 +224,8 @@ namespace Mainsoft.Web.Security
                                "WHERE app.LoweredApplicationName = ? AND usr.ApplicationId = app.ApplicationId " +\r
                                "AND usr.UserId = mbr.UserId AND usr.LoweredUserName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLower ());\r
-                       AddParameter (cmdSelect, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
+                       AddParameter (cmdSelect, "LoweredUserName", username.ToLowerInvariant ());\r
 \r
                        password = null;\r
                        string dbUserId = null;\r
@@ -298,8 +298,8 @@ namespace Mainsoft.Web.Security
                                "WHERE app.LoweredApplicationName = ? AND usr.ApplicationId = app.ApplicationId " +\r
                                "AND usr.UserId = mbr.UserId AND usr.LoweredUserName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLower ());\r
-                       AddParameter (cmdSelect, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
+                       AddParameter (cmdSelect, "LoweredUserName", username.ToLowerInvariant ());\r
                        reader = cmdSelect.ExecuteReader ();\r
                        return 0;\r
                }\r
@@ -311,9 +311,9 @@ namespace Mainsoft.Web.Security
                                "usr.UserId = mbr.UserId AND mbr.LoweredEmail " + (email == null ? "IS NULL" : "= ?");\r
 \r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
                        if (email != null)\r
-                               AddParameter (cmdSelect, "LoweredEmail", email.ToLower ());\r
+                               AddParameter (cmdSelect, "LoweredEmail", email.ToLowerInvariant ());\r
 \r
                        username = null;\r
                        using (OleDbDataReader reader = cmdSelect.ExecuteReader ()) {\r
@@ -361,9 +361,9 @@ namespace Mainsoft.Web.Security
                                        return 1; // user not found\r
                        }\r
 \r
-                       string querySelect = "SELECT usr.UserName, mbr.UserId, mbr.Email, mbr.PasswordQuestion, mbr.Comment, mbr.IsApproved, " + 
-                               "mbr.IsLockedOut, mbr.CreateDate, mbr.LastLoginDate, usr.LastActivityDate, mbr.LastPasswordChangedDate, mbr.LastLockoutDate " +
-                               "FROM aspnet_Users usr, aspnet_Membership mbr " +
+                       string querySelect = "SELECT usr.UserName, mbr.UserId, mbr.Email, mbr.PasswordQuestion, mbr.Comment, mbr.IsApproved, " + \r
+                               "mbr.IsLockedOut, mbr.CreateDate, mbr.LastLoginDate, usr.LastActivityDate, mbr.LastPasswordChangedDate, mbr.LastLockoutDate " +\r
+                               "FROM aspnet_Users usr, aspnet_Membership mbr " +\r
                                "WHERE usr.UserId = ? AND usr.UserId = mbr.UserId";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
                        AddParameter (cmdSelect, "UserId", userId);\r
@@ -379,8 +379,8 @@ namespace Mainsoft.Web.Security
                                "WHERE app.LoweredApplicationName = ? AND usr.ApplicationId = app.ApplicationId " +\r
                                "AND usr.UserId = mbr.UserId AND usr.LoweredUserName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLower ());\r
-                       AddParameter (cmdSelect, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
+                       AddParameter (cmdSelect, "LoweredUserName", username.ToLowerInvariant ());\r
 \r
                        string dbUserId = null;\r
                        string dbPassword = null;\r
@@ -503,7 +503,7 @@ namespace Mainsoft.Web.Security
                                "IsApproved = ?, LastLoginDate = ? WHERE UserId = ?";\r
                        OleDbCommand cmdUpdateMember = new OleDbCommand (queryUpdateMember, (OleDbConnection) connection);\r
                        AddParameter (cmdUpdateMember, "Email", email);\r
-                       AddParameter (cmdUpdateMember, "LoweredEmail", email.ToLower ());\r
+                       AddParameter (cmdUpdateMember, "LoweredEmail", email.ToLowerInvariant ());\r
                        AddParameter (cmdUpdateMember, "Comment", comment);\r
                        AddParameter (cmdUpdateMember, "IsApproved", isApproved);\r
                        AddParameter (cmdUpdateMember, "LastLoginDate", lastLoginDate);\r
@@ -521,8 +521,8 @@ namespace Mainsoft.Web.Security
                                                        "WHERE app.LoweredApplicationName = ? AND usr.ApplicationId = app.ApplicationId " +\r
                                                        "AND usr.UserId = mbr.UserId AND usr.LoweredUserName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLower ());\r
-                       AddParameter (cmdSelect, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
+                       AddParameter (cmdSelect, "LoweredUserName", username.ToLowerInvariant ());\r
 \r
                        string dbUserId = string.Empty;\r
                        bool dbIsApproved = false;\r
@@ -599,7 +599,7 @@ namespace Mainsoft.Web.Security
                {\r
                        string selectQuery = "SELECT UserId FROM aspnet_Users WHERE LoweredUserName = ? AND ApplicationId = ?";\r
                        OleDbCommand selectCmd = new OleDbCommand (selectQuery, (OleDbConnection) connection);\r
-                       AddParameter (selectCmd, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredUserName", username.ToLowerInvariant ());\r
                        AddParameter (selectCmd, "ApplicationId", applicationId);\r
                        if (trans != null)\r
                                selectCmd.Transaction = (OleDbTransaction) trans;\r
@@ -636,7 +636,7 @@ namespace Mainsoft.Web.Security
                        AddParameter (insertCmd, "ApplicationId", applicationId);\r
                        AddParameter (insertCmd, "UserId", userId);\r
                        AddParameter (insertCmd, "UserName", username);\r
-                       AddParameter (insertCmd, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (insertCmd, "LoweredUserName", username.ToLowerInvariant ());\r
                        AddParameter (insertCmd, "IsAnonymous", isAnonymous);\r
                        AddParameter (insertCmd, "LastActivityDate", lastActivityDate);\r
                        if (trans != null)\r
@@ -686,15 +686,16 @@ namespace Mainsoft.Web.Security
                                        numTablesDeletedFrom++;\r
                                }\r
 \r
-                               if ((tablesToDeleteFrom & 8) == 8) {\r
-                                       string queryDelete = "DELETE FROM aspnet_PersonalizationPerUser WHERE UserId = ?";\r
-                                       OleDbCommand cmdDelete = new OleDbCommand (queryDelete, (OleDbConnection) connection);\r
-                                       AddParameter (cmdDelete, "UserId", userId);\r
-                                       cmdDelete.Transaction = trans;\r
-                                       cmdDelete.ExecuteNonQuery ();\r
+                               // this table was removed  from schema\r
+                               //if ((tablesToDeleteFrom & 8) == 8) {\r
+                               //    string queryDelete = "DELETE FROM aspnet_PersonalizationPerUser WHERE UserId = ?";\r
+                               //    OleDbCommand cmdDelete = new OleDbCommand (queryDelete, (OleDbConnection) connection);\r
+                               //    AddParameter (cmdDelete, "UserId", userId);\r
+                               //    cmdDelete.Transaction = trans;\r
+                               //    cmdDelete.ExecuteNonQuery ();\r
 \r
-                                       numTablesDeletedFrom++;\r
-                               }\r
+                               //    numTablesDeletedFrom++;\r
+                               //}\r
 \r
                                if ((tablesToDeleteFrom & 15) == 15) {\r
                                        string queryDelete = "DELETE FROM aspnet_Users WHERE UserId = ?";\r
@@ -720,12 +721,12 @@ namespace Mainsoft.Web.Security
                {\r
                        string selectQuery = "SELECT usr.UserId FROM aspnet_Membership mbr, aspnet_Users usr, aspnet_Applications app WHERE " +\r
                                "usr.LoweredUserName = ? AND app.LoweredApplicationName = ? " +\r
-                               "AND app.ApplicationId = usr.app.ApplicationId " +\r
+                               "AND usr.ApplicationId = app.ApplicationId " +\r
                                "AND usr.UserId = mbr.UserId";\r
 \r
                        OleDbCommand selectCmd = new OleDbCommand (selectQuery, (OleDbConnection) connection);\r
-                       AddParameter (selectCmd, "LoweredUserName", username.ToLower ());\r
-                       AddParameter (selectCmd, "PasswordAnswer", applicationName.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredUserName", username.ToLowerInvariant ());\r
+                       AddParameter (selectCmd, "PasswordAnswer", applicationName.ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = selectCmd.ExecuteReader ()) {\r
                                if (reader.Read ())\r
my mono mirror. check out Moved to http://github.com/mono/mono