- SQLrequest req = SQLreq(this, SQLprovider, databaseid, "SELECT ? FROM ? WHERE ? = '?' AND ? = ?'?')", userfield, usertable, userfield, user->nick, passfield, encryption, user->password);
-
+ std::string thisquery = freeformquery;
+ std::string safepass = user->password;
+ std::string safegecos = user->fullname;
+
+ /* Search and replace the escaped nick and escaped pass into the query */
+
+ SearchAndReplace(safepass, std::string("\""), std::string("\\\""));
+ SearchAndReplace(safegecos, std::string("\""), std::string("\\\""));
+
+ SearchAndReplace(thisquery, std::string("$nick"), user->nick);
+ SearchAndReplace(thisquery, std::string("$pass"), safepass);
+ SearchAndReplace(thisquery, std::string("$host"), user->host);
+ SearchAndReplace(thisquery, std::string("$ip"), std::string(user->GetIPString()));
+ SearchAndReplace(thisquery, std::string("$gecos"), safegecos);
+ SearchAndReplace(thisquery, std::string("$ident"), user->ident);
+ SearchAndReplace(thisquery, std::string("$server"), std::string(user->server));
+ SearchAndReplace(thisquery, std::string("$uuid"), user->uuid);
+
+ Module* HashMod = ServerInstance->Modules->Find("m_md5.so");
+
+ if (HashMod)
+ {
+ HashResetRequest(this, HashMod).Send();
+ SearchAndReplace(thisquery, std::string("$md5pass"), std::string(HashSumRequest(this, HashMod, user->password).Send()));
+ }
+
+ HashMod = ServerInstance->Modules->Find("m_sha256.so");
+
+ if (HashMod)
+ {
+ HashResetRequest(this, HashMod).Send();
+ SearchAndReplace(thisquery, std::string("$sha256pass"), std::string(HashSumRequest(this, HashMod, user->password).Send()));
+ }
+
+ /* Build the query */
+ SQLrequest req = SQLrequest(this, SQLprovider, databaseid, SQLquery(thisquery));
+